# HG changeset patch
# User Xeli
# Date 1329769341 -3600
# Node ID f5eb11306c6a57b20b73d3cc5aa37c64a4ab3aa2
# Parent 03cd336242848513834e69493305ad788e7b08f7
fixed the schemes on android
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/basicflags.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/basicflags.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/basicflags.xml Mon Feb 20 21:22:21 2012 +0100
@@ -1,22 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<basicflags>
- <tflag>
- <default>
- <integer>100</integer>
- </default>
- <image>
- <string>Health</string>
- </image>
- <max>
- <integer>200</integer>
- </max>
- <min>
- <integer>50</integer>
- </min>
- <title>
- <string>Initial Health</string>
- </title>
- </tflag>
<flag>
<checkOverMax>
<boolean>false</boolean>
@@ -70,6 +53,29 @@
</title>
</flag>
<flag>
+ <times1000>
+ <boolean>false</boolean>
+ </times1000>
+ <command>
+ <string>inithealth</string>
+ </command>
+ <default>
+ <integer>200</integer>
+ </default>
+ <image>
+ <string>Health</string>
+ </image>
+ <max>
+ <integer>200</integer>
+ </max>
+ <min>
+ <integer>50</integer>
+ </min>
+ <title>
+ <string>Initial Health</string>
+ </title>
+ </flag>
+ <flag>
<checkOverMax>
<boolean>true</boolean>
</checkOverMax>
@@ -103,6 +109,188 @@
<boolean>false</boolean>
</times1000>
<command>
+ <string>e$casefreq</string>
+ </command>
+ <default>
+ <integer>5</integer>
+ </default>
+ <image>
+ <string>Box</string>
+ </image>
+ <max>
+ <integer>9</integer>
+ </max>
+ <min>
+ <integer>0</integer>
+ </min>
+ <title>
+ <string>Crate Drop Turns</string>
+ </title>
+ </flag>
+ <flag>
+ <checkOverMax>
+ <boolean>false</boolean>
+ </checkOverMax>
+ <times1000>
+ <boolean>true</boolean>
+ </times1000>
+ <command>
+ <string>e$minestime</string>
+ </command>
+ <default>
+ <integer>3</integer>
+ </default>
+ <image>
+ <string>Time</string>
+ </image>
+ <max>
+ <integer>5</integer>
+ </max>
+ <min>
+ <integer>-1</integer>
+ </min>
+ <title>
+ <string>Mines Time</string>
+ </title>
+ </flag>
+ <flag>
+ <checkOverMax>
+ <boolean>false</boolean>
+ </checkOverMax>
+ <times1000>
+ <boolean>false</boolean>
+ </times1000>
+ <command>
+ <string>e$minesnum</string>
+ </command>
+ <default>
+ <integer>4</integer>
+ </default>
+ <image>
+ <string>Mine</string>
+ </image>
+ <max>
+ <integer>80</integer>
+ </max>
+ <min>
+ <integer>0</integer>
+ </min>
+ <title>
+ <string>Mines Number</string>
+ </title>
+ </flag>
+ <flag>
+ <checkOverMax>
+ <boolean>false</boolean>
+ </checkOverMax>
+ <times1000>
+ <boolean>false</boolean>
+ </times1000>
+ <command>
+ <string>e$minedudpct</string>
+ </command>
+ <default>
+ <integer>0</integer>
+ </default>
+ <image>
+ <string>Dud</string>
+ </image>
+ <max>
+ <integer>100</integer>
+ </max>
+ <min>
+ <integer>0</integer>
+ </min>
+ <title>
+ <string>Dud Mines Probability (%)</string>
+ </title>
+ </flag>
+ <flag>
+ <checkOverMax>
+ <boolean>false</boolean>
+ </checkOverMax>
+ <times1000>
+ <boolean>false</boolean>
+ </times1000>
+ <command>
+ <string>e$explosives</string>
+ </command>
+ <default>
+ <integer>2</integer>
+ </default>
+ <image>
+ <string>Damage</string>
+ </image>
+ <max>
+ <integer>40</integer>
+ </max>
+ <min>
+ <integer>0</integer>
+ </min>
+ <title>
+ <string>Explosives</string>
+ </title>
+ </flag>
+ <flag>
+ <checkOverMax>
+ <boolean>false</boolean>
+ </checkOverMax>
+ <times1000>
+ <boolean>false</boolean>
+ </times1000>
+ <command>
+ <string>e$healthprob</string>
+ </command>
+ <default>
+ <integer>35</integer>
+ </default>
+ <image>
+ <string>Health</string>
+ </image>
+ <max>
+ <integer>100</integer>
+ </max>
+ <min>
+ <integer>0</integer>
+ </min>
+ <title>
+ <string>Health Kit Probability (%)</string>
+ </title>
+ </flag>
+ <flag>
+ <checkOverMax>
+ <boolean>false</boolean>
+ </checkOverMax>
+ <times1000>
+ <boolean>false</boolean>
+ </times1000>
+ <command>
+ <string>e$hcaseamount</string>
+ </command>
+ <default>
+ <integer>25</integer>
+ </default>
+ <image>
+ <string>Health</string>
+ </image>
+ <max>
+ <integer>200</integer>
+ </max>
+ <min>
+ <integer>0</integer>
+ </min>
+ <title>
+ <string>Health Amount in Kit</string>
+ </title>
+ </flag>
+ <flag>
+ <checkOverMax>
+ <boolean>false</boolean>
+ </checkOverMax>
+ <times1000>
+ <boolean>false</boolean>
+ </times1000>
+ <command>
<string>e$waterrise</string>
</command>
<default>
@@ -181,188 +369,6 @@
<boolean>false</boolean>
</times1000>
<command>
- <string>e$casefreq</string>
- </command>
- <default>
- <integer>5</integer>
- </default>
- <image>
- <string>Box</string>
- </image>
- <max>
- <integer>9</integer>
- </max>
- <min>
- <integer>0</integer>
- </min>
- <title>
- <string>Crate Drop Turns</string>
- </title>
- </flag>
- <flag>
- <checkOverMax>
- <boolean>false</boolean>
- </checkOverMax>
- <times1000>
- <boolean>false</boolean>
- </times1000>
- <command>
- <string>e$healthprob</string>
- </command>
- <default>
- <integer>35</integer>
- </default>
- <image>
- <string>Health</string>
- </image>
- <max>
- <integer>100</integer>
- </max>
- <min>
- <integer>0</integer>
- </min>
- <title>
- <string>Health Kit Probability (%)</string>
- </title>
- </flag>
- <flag>
- <checkOverMax>
- <boolean>false</boolean>
- </checkOverMax>
- <times1000>
- <boolean>false</boolean>
- </times1000>
- <command>
- <string>e$hcaseamount</string>
- </command>
- <default>
- <integer>25</integer>
- </default>
- <image>
- <string>Health</string>
- </image>
- <max>
- <integer>200</integer>
- </max>
- <min>
- <integer>0</integer>
- </min>
- <title>
- <string>Health Amount in Kit</string>
- </title>
- </flag>
- <flag>
- <checkOverMax>
- <boolean>false</boolean>
- </checkOverMax>
- <times1000>
- <boolean>true</boolean>
- </times1000>
- <command>
- <string>e$minestime</string>
- </command>
- <default>
- <integer>3</integer>
- </default>
- <image>
- <string>Time</string>
- </image>
- <max>
- <integer>5</integer>
- </max>
- <min>
- <integer>-1</integer>
- </min>
- <title>
- <string>Mines Time</string>
- </title>
- </flag>
- <flag>
- <checkOverMax>
- <boolean>false</boolean>
- </checkOverMax>
- <times1000>
- <boolean>false</boolean>
- </times1000>
- <command>
- <string>e$minesnum</string>
- </command>
- <default>
- <integer>4</integer>
- </default>
- <image>
- <string>Mine</string>
- </image>
- <max>
- <integer>80</integer>
- </max>
- <min>
- <integer>0</integer>
- </min>
- <title>
- <string>Mines Number</string>
- </title>
- </flag>
- <flag>
- <checkOverMax>
- <boolean>false</boolean>
- </checkOverMax>
- <times1000>
- <boolean>false</boolean>
- </times1000>
- <command>
- <string>e$minedudpct</string>
- </command>
- <default>
- <integer>0</integer>
- </default>
- <image>
- <string>Dud</string>
- </image>
- <max>
- <integer>100</integer>
- </max>
- <min>
- <integer>0</integer>
- </min>
- <title>
- <string>Dud Mines Probability (%)</string>
- </title>
- </flag>
- <flag>
- <checkOverMax>
- <boolean>false</boolean>
- </checkOverMax>
- <times1000>
- <boolean>false</boolean>
- </times1000>
- <command>
- <string>e$explosives</string>
- </command>
- <default>
- <integer>2</integer>
- </default>
- <image>
- <string>Damage</string>
- </image>
- <max>
- <integer>40</integer>
- </max>
- <min>
- <integer>0</integer>
- </min>
- <title>
- <string>Explosives</string>
- </title>
- </flag>
- <flag>
- <checkOverMax>
- <boolean>false</boolean>
- </checkOverMax>
- <times1000>
- <boolean>false</boolean>
- </times1000>
- <command>
<string>e$getawaytime</string>
</command>
<default>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_barrelmayhem.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_barrelmayhem.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_barrelmayhem.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Barrel Mayhem</name>
<basicflags>
<integer>100</integer>
+ <integer>30</integer>
<integer>100</integer>
- <integer>30</integer>
<integer>15</integer>
+ <integer>0</integer>
+ <integer>0</integer>
+ <integer>0</integer>
+ <integer>0</integer>
+ <integer>80</integer>
+ <integer>35</integer>
+ <integer>25</integer>
<integer>47</integer>
<integer>5</integer>
<integer>100</integer>
- <integer>0</integer>
- <integer>35</integer>
- <integer>25</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>40</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_cleanslate.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_cleanslate.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_cleanslate.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Clean Slate</name>
<basicflags>
<integer>100</integer>
+ <integer>45</integer>
<integer>100</integer>
- <integer>45</integer>
<integer>15</integer>
- <integer>47</integer>
<integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
<integer>3</integer>
<integer>4</integer>
<integer>0</integer>
<integer>2</integer>
+ <integer>35</integer>
+ <integer>25</integer>
+ <integer>47</integer>
+ <integer>5</integer>
+ <integer>100</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_default_scheme.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_default_scheme.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_default_scheme.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Default</name>
<basicflags>
<integer>100</integer>
+ <integer>45</integer>
<integer>100</integer>
- <integer>45</integer>
<integer>15</integer>
- <integer>47</integer>
<integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
<integer>3</integer>
<integer>4</integer>
<integer>0</integer>
<integer>2</integer>
+ <integer>35</integer>
+ <integer>25</integer>
+ <integer>47</integer>
+ <integer>5</integer>
+ <integer>100</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_fortmode.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_fortmode.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_fortmode.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Fort Mode</name>
<basicflags>
<integer>100</integer>
+ <integer>45</integer>
<integer>100</integer>
- <integer>45</integer>
<integer>15</integer>
- <integer>47</integer>
<integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
<integer>3</integer>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
+ <integer>35</integer>
+ <integer>25</integer>
+ <integer>47</integer>
+ <integer>5</integer>
+ <integer>100</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_kingmode.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_kingmode.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_kingmode.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>King Mode</name>
<basicflags>
<integer>100</integer>
+ <integer>45</integer>
<integer>100</integer>
- <integer>45</integer>
<integer>15</integer>
- <integer>47</integer>
<integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>25</integer>
<integer>3</integer>
<integer>4</integer>
<integer>0</integer>
<integer>2</integer>
+ <integer>35</integer>
+ <integer>25</integer>
+ <integer>47</integer>
+ <integer>5</integer>
+ <integer>100</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_minefield.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_minefield.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_minefield.xml Mon Feb 20 21:22:21 2012 +0100
@@ -2,20 +2,21 @@
<scheme>
<name>Minefield</name>
<basicflags>
+ <integer>100</integer>
+ <integer>30</integer>
<integer>50</integer>
- <integer>150</integer>
- <integer>30</integer>
<integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
<integer>0</integer>
- <integer>35</integer>
- <integer>25</integer>
<integer>0</integer>
<integer>80</integer>
<integer>0</integer>
<integer>0</integer>
+ <integer>35</integer>
+ <integer>25</integer>
+ <integer>47</integer>
+ <integer>5</integer>
+ <integer>100</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_promode.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_promode.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_promode.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Pro Mode</name>
<basicflags>
<integer>100</integer>
+ <integer>15</integer>
<integer>100</integer>
<integer>15</integer>
- <integer>15</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
<integer>0</integer>
- <integer>35</integer>
- <integer>25</integer>
<integer>3</integer>
<integer>0</integer>
<integer>0</integer>
<integer>2</integer>
+ <integer>35</integer>
+ <integer>25</integer>
+ <integer>47</integer>
+ <integer>5</integer>
+ <integer>100</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_shoppa.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_shoppa.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_shoppa.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Shoppa</name>
<basicflags>
<integer>100</integer>
+ <integer>30</integer>
<integer>100</integer>
- <integer>300</integer>
<integer>50</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
<integer>1</integer>
- <integer>0</integer>
- <integer>35</integer>
<integer>3</integer>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
+ <integer>0</integer>
+ <integer>25</integer>
+ <integer>47</integer>
+ <integer>5</integer>
+ <integer>100</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_thinkingwithportals.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_thinkingwithportals.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_thinkingwithportals.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Thinking with Portals</name>
<basicflags>
<integer>100</integer>
+ <integer>45</integer>
<integer>100</integer>
- <integer>45</integer>
<integer>15</integer>
+ <integer>2</integer>
+ <integer>3</integer>
+ <integer>5</integer>
+ <integer>0</integer>
+ <integer>5</integer>
+ <integer>25</integer>
+ <integer>25</integer>
<integer>47</integer>
<integer>5</integer>
<integer>100</integer>
- <integer>2</integer>
- <integer>25</integer>
- <integer>25</integer>
- <integer>4</integer>
- <integer>5</integer>
- <integer>0</integer>
- <integer>5</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_timeless.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_timeless.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_timeless.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Timeless</name>
<basicflags>
<integer>100</integer>
+ <integer>9999</integer>
<integer>100</integer>
+ <integer>15</integer>
+ <integer>5</integer>
+ <integer>3</integer>
+ <integer>5</integer>
+ <integer>10</integer>
+ <integer>2</integer>
+ <integer>35</integer>
+ <integer>30</integer>
+ <integer>0</integer>
+ <integer>0</integer>
<integer>100</integer>
<integer>100</integer>
- <integer>47</integer>
- <integer>5</integer>
- <integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>30</integer>
- <integer>5</integer>
- <integer>3</integer>
- <integer>10</integer>
- <integer>2</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/res/raw/scheme_tunnelhogs.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/scheme_tunnelhogs.xml Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/scheme_tunnelhogs.xml Mon Feb 20 21:22:21 2012 +0100
@@ -3,19 +3,20 @@
<name>Tunnelhogs</name>
<basicflags>
<integer>100</integer>
+ <integer>30</integer>
<integer>100</integer>
- <integer>30</integer>
<integer>15</integer>
+ <integer>5</integer>
+ <integer>3</integer>
+ <integer>10</integer>
+ <integer>10</integer>
+ <integer>10</integer>
+ <integer>35</integer>
+ <integer>25</integer>
<integer>47</integer>
<integer>5</integer>
<integer>100</integer>
- <integer>5</integer>
- <integer>35</integer>
- <integer>3</integer>
- <integer>25</integer>
- <integer>10</integer>
- <integer>10</integer>
- <integer>10</integer>
+ <integer>100</integer>
</basicflags>
<gamemod>
<false/>
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Scheme.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Scheme.java Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Datastructures/Scheme.java Mon Feb 20 21:22:21 2012 +0100
@@ -46,6 +46,7 @@
private Integer gamemod;
private ArrayList<Integer> basic;;
private static ArrayList<LinkedHashMap<String, ?>> basicflags = new ArrayList<LinkedHashMap<String, ?>>();//TODO why is it static?
+ public int health;
public Scheme(String _name, ArrayList<Integer> _basic, int _gamemod){
name = _name;
@@ -65,6 +66,12 @@
String command = (String)basicflag.get("command");
Integer value = basic.get(pos);
+
+ if(command.equals("inithealth")){//Health is a special case, it doesn't need to be send
+ health = value; //to the engine yet, we'll do that with the other HH info
+ continue;
+ }
+
Boolean checkOverMax = (Boolean) basicflag.get("checkOverMax");
Boolean times1000 = (Boolean) basicflag.get("times1000");
Integer max = (Integer) basicflag.get("max");
@@ -106,6 +113,7 @@
String name = null;
ArrayList<Integer> basic = new ArrayList<Integer>();
Integer gamemod = 0;
+ int health = 0;
int mask = 0x000000004;
int eventType = xmlPuller.getEventType();
diff -r 03cd33624284 -r f5eb11306c6a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/GameConfig.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/GameConfig.java Mon Feb 20 21:22:04 2012 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/GameConfig.java Mon Feb 20 21:22:21 2012 +0100
@@ -79,7 +79,7 @@
weapon.sendToEngine(epn, teamCount);
for(Team t : teams){
- if(t != null)t.sendToEngine(epn, teamCount, 50);
+ if(t != null)t.sendToEngine(epn, teamCount, scheme.health);
}
}