- <string>Initial Health</string> -

# 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 @@ - - - 100 - - - Health - - - 200 - - - 50 - - - <string>Initial Health</string> - - false @@ -70,6 +53,29 @@ + + false + + + inithealth + + + 200 + + + Health + + + 200 + + + 50 + + + <string>Initial Health</string> + + + true @@ -103,6 +109,188 @@ false + e$casefreq + + + 5 + + + Box + + + 9 + + + 0 + + + <string>Crate Drop Turns</string> + + + + + false + + + true + + + e$minestime + + + 3 + + + Time + + + 5 + + + -1 + + + <string>Mines Time</string> + + + + + false + + + false + + + e$minesnum + + + 4 + + + Mine + + + 80 + + + 0 + + + <string>Mines Number</string> + + + + + false + + + false + + + e$minedudpct + + + 0 + + + Dud + + + 100 + + + 0 + + + <string>Dud Mines Probability (%)</string> + + + + + false + + + false + + + e$explosives + + + 2 + + + Damage + + + 40 + + + 0 + + + <string>Explosives</string> + + + + + false + + + false + + + e$healthprob + + + 35 + + + Health + + + 100 + + + 0 + + + <string>Health Kit Probability (%)</string> + + + + + false + + + false + + + e$hcaseamount + + + 25 + + + Health + + + 200 + + + 0 + + + <string>Health Amount in Kit</string> + + + + + false + + + false + + e$waterrise @@ -181,188 +369,6 @@ false - e$casefreq - - - 5 - - - Box - - - 9 - - - 0 - - - <string>Crate Drop Turns</string> - - - - - false - - - false - - - e$healthprob - - - 35 - - - Health - - - 100 - - - 0 - - - <string>Health Kit Probability (%)</string> - - - - - false - - - false - - - e$hcaseamount - - - 25 - - - Health - - - 200 - - - 0 - - - <string>Health Amount in Kit</string> - - - - - false - - - true - - - e$minestime - - - 3 - - - Time - - - 5 - - - -1 - - - <string>Mines Time</string> - - - - - false - - - false - - - e$minesnum - - - 4 - - - Mine - - - 80 - - - 0 - - - <string>Mines Number</string> - - - - - false - - - false - - - e$minedudpct - - - 0 - - - Dud - - - 100 - - - 0 - - - <string>Dud Mines Probability (%)</string> - - - - - false - - - false - - - e$explosives - - - 2 - - - Damage - - - 40 - - - 0 - - - <string>Explosives</string> - - - - - false - - - false - - e$getawaytime 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 @@ Barrel Mayhem 100 + 30 100 - 30 15 + 0 + 0 + 0 + 0 + 80 + 35 + 25 47 5 100 - 0 - 35 - 25 - 0 - 0 - 0 - 40 + 100 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 @@ Clean Slate 100 + 45 100 - 45 15 - 47 5 - 100 - 5 - 35 - 25 3 4 0 2 + 35 + 25 + 47 + 5 + 100 + 100 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 @@ Default 100 + 45 100 - 45 15 - 47 5 - 100 - 5 - 35 - 25 3 4 0 2 + 35 + 25 + 47 + 5 + 100 + 100 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 @@ Fort Mode 100 + 45 100 - 45 15 - 47 5 - 100 - 5 - 35 - 25 3 0 0 0 + 35 + 25 + 47 + 5 + 100 + 100 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 @@ King Mode 100 + 45 100 - 45 15 - 47 5 - 100 - 5 - 35 - 25 3 4 0 2 + 35 + 25 + 47 + 5 + 100 + 100 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 @@ Minefield + 100 + 30 50 - 150 - 30 15 - 47 - 5 - 100 0 - 35 - 25 0 80 0 0 + 35 + 25 + 47 + 5 + 100 + 100 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 @@ Pro Mode 100 + 15 100 15 - 15 - 47 - 5 - 100 0 - 35 - 25 3 0 0 2 + 35 + 25 + 47 + 5 + 100 + 100 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 @@ Shoppa 100 + 30 100 - 300 50 - 47 - 5 - 100 1 - 0 - 35 3 0 0 0 + 0 + 25 + 47 + 5 + 100 + 100 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 @@ Thinking with Portals 100 + 45 100 - 45 15 + 2 + 3 + 5 + 0 + 5 + 25 + 25 47 5 100 - 2 - 25 - 25 - 4 - 5 - 0 - 5 + 100 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 @@ Timeless 100 + 9999 100 + 15 + 5 + 3 + 5 + 10 + 2 + 35 + 30 + 0 + 0 100 100 - 47 - 5 - 100 - 5 - 35 - 30 - 5 - 3 - 10 - 2 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 @@ Tunnelhogs 100 + 30 100 - 30 15 + 5 + 3 + 10 + 10 + 10 + 35 + 25 47 5 100 - 5 - 35 - 3 - 25 - 10 - 10 - 10 + 100 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 basic;; private static ArrayList> basicflags = new ArrayList>();//TODO why is it static? + public int health; public Scheme(String _name, ArrayList _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 basic = new ArrayList(); 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); } }