--- a/QTfrontend/ammoSchemeModel.cpp Sat Nov 06 19:40:49 2010 +0100
+++ b/QTfrontend/ammoSchemeModel.cpp Sat Nov 06 20:38:59 2010 +0100
@@ -70,7 +70,9 @@
<< "Clean Slate"
<< "Minefield"
<< "Barrel Mayhem"
- << "Tunnel Hogs";
+ << "Tunnel Hogs"
+ << "Fort Mode"
+ << "Timeless";
numberOfDefaultSchemes = predefSchemesNames.size();
@@ -208,7 +210,7 @@
<< QVariant(true) // inf. attack 19
<< QVariant(true) // reset weps 20
<< QVariant(false) // per hog ammo 21
- << QVariant(100) // damage modfier 22
+ << QVariant(120) // damage modfier 22
<< QVariant(45) // turn time 23
<< QVariant(100) // init health 24
<< QVariant(15) // sudden death 25
@@ -217,8 +219,8 @@
<< QVariant(4) // mines number 28
<< QVariant(0) // mine dud pct 29
<< QVariant(2) // explosives 30
- << QVariant(35) // health case pct 31
- << QVariant(25) // health case amt 32
+ << QVariant(25) // health case pct 31
+ << QVariant(50) // health case amt 32
;
QList<QVariant> minefield;
@@ -332,6 +334,80 @@
<< QVariant(25) // health case amt 32
;
+ QList<QVariant> forts;
+ forts
+ << predefSchemesNames[7] // name 0
+ << QVariant(true) // fortsmode 1
+ << QVariant(true) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(true) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(false) // per hog ammo 21
+ << QVariant(100) // damage modfier 22
+ << QVariant(45) // turn time 23
+ << QVariant(100) // init health 24
+ << QVariant(15) // sudden death 25
+ << QVariant(5) // case prob 26
+ << QVariant(3) // mines time 27
+ << QVariant(0) // mines number 28
+ << QVariant(0) // mine dud pct 29
+ << QVariant(0) // explosives 30
+ << QVariant(35) // health case pct 31
+ << QVariant(25) // health case amt 32
+ ;
+
+ QList<QVariant> timeless;
+ timeless
+ << predefSchemesNames[8] // name 0
+ << QVariant(false) // fortsmode 1
+ << QVariant(false) // team divide 2
+ << QVariant(false) // solid land 3
+ << QVariant(false) // border 4
+ << QVariant(false) // low gravity 5
+ << QVariant(false) // laser sight 6
+ << QVariant(false) // invulnerable 7
+ << QVariant(false) // reset health 8
+ << QVariant(false) // vampiric 9
+ << QVariant(false) // karma 10
+ << QVariant(false) // artillery 11
+ << QVariant(true) // random order 12
+ << QVariant(false) // king 13
+ << QVariant(false) // place hog 14
+ << QVariant(false) // shared ammo 15
+ << QVariant(false) // disable girders 16
+ << QVariant(false) // disable land objects 17
+ << QVariant(false) // AI survival 18
+ << QVariant(false) // inf. attack 19
+ << QVariant(false) // reset weps 20
+ << QVariant(true) // per hog ammo 21
+ << QVariant(100) // damage modfier 22
+ << QVariant(9999) // turn time 23
+ << QVariant(100) // init health 24
+ << QVariant(999) // sudden death 25
+ << QVariant(5) // case prob 26
+ << QVariant(3) // mines time 27
+ << QVariant(5) // mines number 28
+ << QVariant(10) // mine dud pct 29
+ << QVariant(2) // explosives 30
+ << QVariant(35) // health case pct 31
+ << QVariant(30) // health case amt 32
+ ;
+
schemes.append(defaultScheme);
schemes.append(proMode);
schemes.append(shoppa);
@@ -339,6 +415,8 @@
schemes.append(minefield);
schemes.append(barrelmayhem);
schemes.append(tunnelhogs);
+ schemes.append(forts);
+ schemes.append(timeless);
int size = fileConfig.beginReadArray("schemes");
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m Sat Nov 06 19:40:49 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Sat Nov 06 20:38:59 2010 +0100
@@ -187,7 +187,7 @@
// support for endless games
NSInteger tentativeTurntime = [[basicArray objectAtIndex:i] intValue];
- if (tentativeTurntime == 100)
+ if (tentativeTurntime >= 100)
tentativeTurntime = 9999;
NSString *turnTime = [[NSString alloc] initWithFormat:@"e$turntime %d",tentativeTurntime * 1000];
[self sendToEngine:turnTime];
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Sat Nov 06 19:40:49 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Sat Nov 06 20:38:59 2010 +0100
@@ -7,13 +7,13 @@
<integer>100</integer>
<integer>100</integer>
<integer>100</integer>
- <integer>15</integer>
+ <integer>999</integer>
<integer>5</integer>
<integer>35</integer>
- <integer>25</integer>
+ <integer>30</integer>
<integer>3</integer>
- <integer>4</integer>
- <integer>0</integer>
+ <integer>5</integer>
+ <integer>10</integer>
<integer>2</integer>
</array>
<key>gamemod</key>
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/gameFlags_en.plist Sat Nov 06 19:40:49 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/gameFlags_en.plist Sat Nov 06 20:38:59 2010 +0100
@@ -100,7 +100,7 @@
</dict>
<dict>
<key>description</key>
- <string>Play with a King. If he dies, your side loses</string>
+ <string>Play with a King; when he dies, your side loses</string>
<key>image</key>
<string>King</string>
<key>title</key>