# HG changeset patch
# User koda
# Date 1292984894 -3600
# Node ID a5c2f09daaaaa290f94943dbf1abbe6789e7f5ce
# Parent d362ab6c7f53c0a1c377b04272c37619e790e8e4
this should prevent that ever again
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Classes/CreationChamber.m
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.m Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.m Wed Dec 22 03:28:14 2010 +0100
@@ -147,9 +147,8 @@
NSMutableArray *basicArray = [[NSMutableArray alloc] initWithObjects:
[NSNumber numberWithInt:100], //initialhealth
+ [NSNumber numberWithInt:100], //damagemodifier
[NSNumber numberWithInt:45], //turntime
- [NSNumber numberWithInt:3], //minestime
- [NSNumber numberWithInt:100], //damagemodifier
[NSNumber numberWithInt:15], //suddendeathtimeout
[NSNumber numberWithInt:47], //waterrise
[NSNumber numberWithInt:5], //healthdecrease
@@ -157,6 +156,7 @@
[NSNumber numberWithInt:5], //cratedrops
[NSNumber numberWithInt:35], //healthprob
[NSNumber numberWithInt:25], //healthamount
+ [NSNumber numberWithInt:3], //minestime
[NSNumber numberWithInt:4], //minesnumber
[NSNumber numberWithInt:0], //dudmines
[NSNumber numberWithInt:2], //explosives
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Classes/GameSetup.m
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Dec 22 03:28:14 2010 +0100
@@ -182,28 +182,16 @@
NSArray *mods = [[NSArray alloc] initWithContentsOfFile:path];
[path release];
- int i = 0;
- // initial health
- result = [[basicArray objectAtIndex:i++] intValue];
+ result = [[basicArray objectAtIndex:0] intValue];
- // turn time
- NSInteger tentativeTurntime = [[basicArray objectAtIndex:i++] intValue];
- if (tentativeTurntime >= 100)
- tentativeTurntime = 9999;
- NSString *turnTime = [[NSString alloc] initWithFormat:@"e$turntime %d",tentativeTurntime * 1000];
- [self sendToEngine:turnTime];
- [turnTime release];
-
- NSString *minesTime = [[NSString alloc] initWithFormat:@"e$minestime %d",[[basicArray objectAtIndex:i++] intValue] * 1000];
- [self sendToEngine:minesTime];
- [minesTime release];
-
- for (; i < [basicArray count]; i++) {
- NSDictionary *basicDict = [mods objectAtIndex:i];
- NSString *command = [basicDict objectForKey:@"command"];
+ for (int i = 1; i < [basicArray count]; i++) {
+ NSDictionary *dict = [mods objectAtIndex:i];
+ NSString *command = [dict objectForKey:@"command"];
NSInteger value = [[basicArray objectAtIndex:i] intValue];
- if ([basicDict objectForKey:@"checkOverMax"] && value >= [[basicDict objectForKey:@"max"] intValue])
+ if ([[dict objectForKey:@"checkOverMax"] boolValue] && value >= [[dict objectForKey:@"max"] intValue])
value = 9999;
+ if ([[dict objectForKey:@"times1000"] boolValue])
+ value = value * 1000;
NSString *strToSend = [[NSString alloc] initWithFormat:@"%@ %d",command,value];
[self sendToEngine:strToSend];
[strToSend release];
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
30
- 0
- 100
15
47
5
@@ -17,6 +16,7 @@
25
0
0
+ 0
40
gamemod
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
45
- 3
- 100
15
47
5
@@ -15,6 +14,7 @@
5
35
25
+ 3
4
0
2
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
45
- 3
- 100
15
47
5
@@ -15,6 +14,7 @@
5
35
25
+ 3
4
0
2
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
45
- 3
- 100
15
47
5
@@ -15,6 +14,7 @@
5
35
25
+ 3
0
0
0
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
45
- 3
- 100
15
47
5
@@ -15,6 +14,7 @@
5
35
25
+ 3
4
0
2
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
50
+ 150
30
- 0
- 150
15
47
5
@@ -15,6 +14,7 @@
0
35
25
+ 0
80
0
0
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
15
- 3
- 100
15
47
5
@@ -15,6 +14,7 @@
0
35
25
+ 3
0
0
2
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
300
- 3
- 100
50
47
5
@@ -15,6 +14,7 @@
1
0
35
+ 3
0
0
0
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,9 +5,8 @@
basic
100
+ 100
45
- 4
- 100
15
47
5
@@ -15,6 +14,7 @@
2
25
25
+ 4
5
0
5
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Wed Dec 22 03:28:14 2010 +0100
@@ -6,7 +6,6 @@
100
100
- 5
100
100
47
@@ -15,6 +14,7 @@
5
35
30
+ 5
3
10
2
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Wed Dec 22 03:28:14 2010 +0100
@@ -5,15 +5,15 @@
basic
100
+ 100
30
- 3
- 100
15
47
5
100
5
35
+ 3
25
10
10
diff -r d362ab6c7f53 -r a5c2f09daaaa project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Wed Dec 22 03:05:28 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Wed Dec 22 03:28:14 2010 +0100
@@ -3,10 +3,6 @@
- checkOverMax
-
- command
-
default
100
image
@@ -21,37 +17,7 @@
checkOverMax
- command
- e$turntime
- default
- 45
- image
- Time
- max
- 100
- min
- 1
- title
- Turn Time
-
-
- checkOverMax
-
- command
- e$minestime
- default
- 3
- image
- Time
- max
- 5
- min
- -1
- title
- Mines Time
-
-
- checkOverMax
+ times1000
command
e$damagepct
@@ -69,6 +35,26 @@
checkOverMax
+ times1000
+
+ command
+ e$turntime
+ default
+ 45
+ image
+ Time
+ max
+ 100
+ min
+ 1
+ title
+ Turn Time
+
+
+ checkOverMax
+
+ times1000
+
command
e$sd_turns
default
@@ -85,6 +71,8 @@
checkOverMax
+ times1000
+
command
e$waterrise
default
@@ -101,6 +89,8 @@
checkOverMax
+ times1000
+
command
e$healthdec
default
@@ -117,6 +107,8 @@
checkOverMax
+ times1000
+
command
e$ropepct
default
@@ -133,6 +125,8 @@
checkOverMax
+ times1000
+
command
e$casefreq
default
@@ -149,6 +143,8 @@
checkOverMax
+ times1000
+
command
e$healthprob
default
@@ -165,6 +161,8 @@
checkOverMax
+ times1000
+
command
e$hcaseamount
default
@@ -181,6 +179,26 @@
checkOverMax
+ times1000
+
+ command
+ e$minestime
+ default
+ 3
+ image
+ Time
+ max
+ 5
+ min
+ -1
+ title
+ Mines Time
+
+
+ checkOverMax
+
+ times1000
+
command
e$minesnum
default
@@ -197,6 +215,8 @@
checkOverMax
+ times1000
+
command
e$minedudpct
default
@@ -213,6 +233,8 @@
checkOverMax
+ times1000
+
command
e$explosives
default