merge again? :o
authorkoda
Mon, 08 Nov 2010 23:59:21 +0100
changeset 4220 20b67364aef9
parent 4216 184181604092 (diff)
parent 4219 4162db7c11bb (current diff)
child 4221 a1bf0f6b0d65
merge again? :o
--- a/QTfrontend/gamecfgwidget.cpp	Mon Nov 08 23:16:13 2010 +0100
+++ b/QTfrontend/gamecfgwidget.cpp	Mon Nov 08 23:59:21 2010 +0100
@@ -158,7 +158,7 @@
     sl.append(QString("e$gmflags %1").arg(getGameFlags()));
     sl.append(QString("e$damagepct %1").arg(schemeData(22).toInt()));
     sl.append(QString("e$turntime %1").arg(schemeData(23).toInt() * 1000));
-    sl.append(QString("e$minestime %1").arg(schemeData(27).toInt() * 1000));
+    sl.append(QString("e$minestime %1").arg(schemeData(27).toInt()));
     sl.append(QString("e$minesnum %1").arg(schemeData(28).toInt()));
     sl.append(QString("e$sd_turns %1").arg(schemeData(25).toInt()));
     sl.append(QString("e$casefreq %1").arg(schemeData(26).toInt()));
--- a/hedgewars/uAI.pas	Mon Nov 08 23:16:13 2010 +0100
+++ b/hedgewars/uAI.pas	Mon Nov 08 23:59:21 2010 +0100
@@ -333,7 +333,7 @@
 with CurrentHedgehog^ do
      if (Gear <> nil)
         and ((Gear^.State and gstHHDriven) <> 0)
-        and (TurnTimeLeft < cHedgehogTurnTime - 50) then
+        and (TurnTimeLeft + 50 > cHedgehogTurnTime ) then
         if ((Gear^.State and gstHHThinking) = 0) then
            if (BestActions.Pos >= BestActions.Count)
               and (TurnTimeLeft > cStopThinkTime) then
--- a/hedgewars/uGears.pas	Mon Nov 08 23:16:13 2010 +0100
+++ b/hedgewars/uGears.pas	Mon Nov 08 23:59:21 2010 +0100
@@ -365,9 +365,9 @@
                 gear^.Elasticity:= _0_55;
                 gear^.Friction:= _0_995;
                 if cMinesTime < 0 then
-                    gear^.Timer:= getrandom(6)*1000
+                    gear^.Timer:= getrandom(51)*100
                 else
-                    gear^.Timer:= cMinesTime*1;
+                    gear^.Timer:= cMinesTime*1000;
                 end;
        gtSMine: begin
                 gear^.Health:= 10;
--- a/hedgewars/uMisc.pas	Mon Nov 08 23:16:13 2010 +0100
+++ b/hedgewars/uMisc.pas	Mon Nov 08 23:59:21 2010 +0100
@@ -758,7 +758,7 @@
     cMapGen             := 0;   // MAPGEN_REGULAR
     cMazeSize           := 0;
     cHedgehogTurnTime   := 45000;
-    cMinesTime          := 3000;
+    cMinesTime          := 3;
     cMaxAIThinkTime     := 9000;
     cCloudsNumber       := 9;
     cHealthCaseProb     := 35;
--- a/hedgewars/uWorld.pas	Mon Nov 08 23:16:13 2010 +0100
+++ b/hedgewars/uWorld.pas	Mon Nov 08 23:59:21 2010 +0100
@@ -149,14 +149,14 @@
 ScreenFadeSpeed:= 1;
 
 // modified mine timers?
-if cMinesTime <> 3000 then
+if cMinesTime <> 3 then
     begin
     if cMinesTime = 0 then
         g:= AddGoal(g, gfAny, gidNoMineTimer)
     else if cMinesTime < 0 then
         g:= AddGoal(g, gfAny, gidRandomMineTimer)
     else
-        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime div 1000);
+        g:= AddGoal(g, gfAny, gidMineTimer, cMinesTime);
     end;
 
 // if the string has been set, show it for (default timeframe) seconds
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Mon Nov 08 23:59:21 2010 +0100
@@ -138,10 +138,12 @@
     }
     
     NSMutableArray *basicArray  = [[NSMutableArray alloc] initWithObjects:
-                                   [NSNumber numberWithInt:100],      //damagemodifier
+                                   [NSNumber numberWithInt:100],      //initialhealth
                                    [NSNumber numberWithInt:45],       //turntime
-                                   [NSNumber numberWithInt:100],      //initialhealth
+                                   [NSNumber numberWithInt:100],      //damagemodifier
                                    [NSNumber numberWithInt:15],       //suddendeathtimeout
+                                   [NSNumber numberWithInt:47],       //waterrise
+                                   [NSNumber numberWithInt:5],        //healthdecrease
                                    [NSNumber numberWithInt:5],        //cratedrops
                                    [NSNumber numberWithInt:35],       //healthprob
                                    [NSNumber numberWithInt:25],       //healthamount
@@ -270,14 +272,14 @@
 }
 
 NSArray inline *getAvailableColors (void) {
-    return [NSArray arrayWithObjects:[NSNumber numberWithUnsignedInt:0x4376e9],     // bluette
+    return [NSArray arrayWithObjects:[NSNumber numberWithUnsignedInt:0x3376E9],     // bluette
                                      [NSNumber numberWithUnsignedInt:0x3e9321],     // greeeen
                                      [NSNumber numberWithUnsignedInt:0xa23dbb],     // violett
                                      [NSNumber numberWithUnsignedInt:0xff9329],     // oranngy
                                      [NSNumber numberWithUnsignedInt:0xdd0000],     // reddish
                                      [NSNumber numberWithUnsignedInt:0x737373],     // graaaay
-                                     [NSNumber numberWithUnsignedInt:0xbba23d],     // gold$$$
-                                     [NSNumber numberWithUnsignedInt:0x3da2bb],     // cyannnn  
+                                     [NSNumber numberWithUnsignedInt:0x00FFFF],     // cyannnn  
+                                     [NSNumber numberWithUnsignedInt:0xFF8888],     // peachyj
                                      nil];
 }
 
--- a/project_files/HedgewarsMobile/Classes/EditableCellView.m	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/EditableCellView.m	Mon Nov 08 23:59:21 2010 +0100
@@ -31,7 +31,6 @@
 
         textField = [[UITextField alloc] initWithFrame:CGRectZero];
         textField.backgroundColor = [UIColor clearColor];
-        textField.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
         textField.delegate = self;
         textField.clearButtonMode = UITextFieldViewModeWhileEditing;
         textField.clearsOnBeginEditing = NO;
@@ -77,6 +76,8 @@
         skew +=2;
     }
 
+    // sometimes the bold property gets lost
+    textField.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];
     textField.frame = CGRectMake(boundsX+offset+10, skew+10, 300, [UIFont labelFontSize] + 4);
 }
 
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m	Mon Nov 08 23:59:21 2010 +0100
@@ -168,7 +168,6 @@
     int i = 0;
     int result = 0;
     int mask = 0x00000004;
-    int basicArraySize = [basicArray count] - 1;
 
     // pack the gameflags in a single var and send it
     for (NSNumber *value in gamemodArray) {
@@ -180,64 +179,34 @@
     [self sendToEngine:flags];
     [flags release];
 
-    NSString *dmgMod = [[NSString alloc] initWithFormat:@"e$damagepct %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:dmgMod];
-    [dmgMod release];
-    if (i < basicArraySize) i++;
+    /* basic game flags */
+    NSString *path = [[NSString alloc] initWithFormat:@"%@/basicFlags_en.plist",IFRONTEND_DIRECTORY()];
+    NSArray *mods = [[NSArray alloc] initWithContentsOfFile:path];
+    [path release];
 
-    // support for endless games
-    NSInteger tentativeTurntime = [[basicArray objectAtIndex:i] intValue];
+    // initial health
+    result = [[basicArray objectAtIndex:0] intValue];
+
+    // turn time
+    NSInteger tentativeTurntime = [[basicArray objectAtIndex:1] intValue];
     if (tentativeTurntime >= 100)
         tentativeTurntime = 9999;
     NSString *turnTime = [[NSString alloc] initWithFormat:@"e$turntime %d",tentativeTurntime * 1000];
     [self sendToEngine:turnTime];
     [turnTime release];
-    if (i < basicArraySize) i++;
-
-    result = [[basicArray objectAtIndex:i] intValue]; // initial health
-    if (i < basicArraySize) i++;
-
-    NSString *sdTime = [[NSString alloc] initWithFormat:@"e$sd_turns %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:sdTime];
-    [sdTime release];
-    if (i < basicArraySize) i++;
-
-    NSString *crateDrops = [[NSString alloc] initWithFormat:@"e$casefreq %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:crateDrops];
-    [crateDrops release];
-    if (i < basicArraySize) i++;
-
-    NSString *healthProb = [[NSString alloc] initWithFormat:@"e$healthprob %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:healthProb];
-    [healthProb release];
-    if (i < basicArraySize) i++;
 
-    NSString *healthAmount = [[NSString alloc] initWithFormat:@"e$hcaseamount %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:healthAmount];
-    [healthAmount release];
-    if (i < basicArraySize) i++;
-
-    NSString *minesTime = [[NSString alloc] initWithFormat:@"e$minestime %d",[[basicArray objectAtIndex:i] intValue] * 1000];
-    [self sendToEngine:minesTime];
-    [minesTime release];
-    if (i < basicArraySize) i++;
+    for (i = 2; i < [basicArray count]; i++) {
+        NSDictionary *basicDict = [mods objectAtIndex:i];
+        NSString *command = [basicDict objectForKey:@"command"];
+        NSInteger value = [[basicArray objectAtIndex:i] intValue];
+        if ([basicDict objectForKey:@"checkOverMax"] && value >= [[basicDict objectForKey:@"max"] intValue])
+            value = 9999;
+        NSString *strToSend = [[NSString alloc] initWithFormat:@"%@ %d",command,value];
+        [self sendToEngine:strToSend];
+        [strToSend release];
+    }
+    [mods release];
 
-    NSString *minesNumber = [[NSString alloc] initWithFormat:@"e$minesnum %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:minesNumber];
-    [minesNumber release];
-    if (i < basicArraySize) i++;
-
-    NSString *dudMines = [[NSString alloc] initWithFormat:@"e$minedudpct %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:dudMines];
-    [dudMines release];
-    if (i < basicArraySize) i++;
-
-    NSString *explosives = [[NSString alloc] initWithFormat:@"e$explosives %d",[[basicArray objectAtIndex:i] intValue]];
-    [self sendToEngine:explosives];
-    [explosives release];
-    if (i < basicArraySize) i++;
-
-    DLog(@"Sent %d flags and %d modes", [gamemodArray count], i);
     [schemeDictionary release];
     return result;
 }
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Mon Nov 08 23:59:21 2010 +0100
@@ -28,6 +28,19 @@
 #define SLIDER_TAG 54321
 #define SWITCH_TAG 67890
 
+#define checkValueString(detailString,labelSting,sliderRef); \
+    if ([labelSting isEqualToString:@"Turn Time"] && (NSInteger) sliderRef.value == 100) \
+        detailString = @"∞"; \
+    else if ([labelSting isEqualToString:@"Water Rise Amount"] && (NSInteger) sliderRef.value == 100) \
+        detailString = NSLocalizedString(@"Nvr",@"Short for 'Never'"); \
+    else if ([labelSting isEqualToString:@"Crate Drop Turns"] && (NSInteger) sliderRef.value == 0) \
+        detailString = NSLocalizedString(@"Nvr",@"Short for 'Never'"); \
+    else if ([labelSting isEqualToString:@"Mines Time"] && (NSInteger) sliderRef.value == -1) \
+        detailString = NSLocalizedString(@"Rnd",@"Short for 'Random'"); \
+    else \
+        detailString = [NSString stringWithFormat:@"%d",(NSInteger) sliderRef.value];
+
+
 @implementation SingleSchemeViewController
 @synthesize schemeName, schemeDictionary, basicSettingList, gameModifierArray;
 
@@ -161,8 +174,6 @@
                     offset = 50;
 
                 UISlider *slider = [[UISlider alloc] initWithFrame:CGRectMake(offset+260, 12, offset+150, 23)];
-                slider.maximumValue = [[detail objectForKey:@"max"] floatValue];
-                slider.minimumValue = [[detail objectForKey:@"min"] floatValue];
                 [slider addTarget:self action:@selector(sliderChanged:) forControlEvents:UIControlEventValueChanged];
                 [cell.contentView addSubview:slider];
                 [slider release];
@@ -191,19 +202,14 @@
                 } 
             }
             cellSlider.tag = SLIDER_TAG + row;
+            cellSlider.maximumValue = [[detail objectForKey:@"max"] floatValue];
+            cellSlider.minimumValue = [[detail objectForKey:@"min"] floatValue];
             cellSlider.value = [[[self.schemeDictionary objectForKey:@"basic"] objectAtIndex:row] floatValue];
 
+            NSString *prestring = nil;
+            checkValueString(prestring,cellLabel.text,cellSlider);
+
             // forced to use this weird format otherwise the label disappears when size of the text is bigger than the original
-            NSString *prestring = [NSString stringWithFormat:@"%d",(NSInteger) cellSlider.value];
-
-            // turntime 100 means unlimited time turns (set in GameSetup)
-            if (row == 1 && (NSInteger) cellSlider.value == 100)
-                prestring = @"∞";
-            else
-                // mines less than 0 means random
-                if (row == 5 && (NSInteger) cellSlider.value == -1)
-                    prestring = NSLocalizedString(@"Rnd",@"Short for 'Random'");
-            
             while ([prestring length] <= 4)
                 prestring = [NSString stringWithFormat:@" %@",prestring];
             cell.detailTextLabel.text = prestring;
@@ -254,16 +260,13 @@
     NSIndexPath *indexPath = [NSIndexPath indexPathForRow:theSlider.tag-SLIDER_TAG inSection:1];
     // get its cell
     UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
-    // grab the associated label
-    UILabel *label = (UILabel *)cell.detailTextLabel;
+    // grab the associated labels
+    UILabel *detailLabel = (UILabel *)cell.detailTextLabel;
+    UILabel *cellLabel = (UILabel *)[cell.contentView viewWithTag:LABEL_TAG];
     // modify it
-    if ([indexPath row] == 1 && [indexPath section] == 1 && (NSInteger) theSlider.value == 100)
-        label.text = @"∞";
-    else
-        if ([indexPath row] == 5 && [indexPath section] == 1 && (NSInteger) theSlider.value == -1)
-            label.text = NSLocalizedString(@"Rnd",@"Short for 'Random'");
-        else
-            label.text = [NSString stringWithFormat:@"%d",(NSInteger) theSlider.value];
+
+    checkValueString(detailLabel.text,cellLabel.text,theSlider);
+
     // save changes in the main array
     NSMutableArray *array = [self.schemeDictionary objectForKey:@"basic"];
     [array replaceObjectAtIndex:theSlider.tag-SLIDER_TAG withObject:[NSNumber numberWithInt:(NSInteger) theSlider.value]];
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -8,6 +8,8 @@
 		<integer>30</integer>
 		<integer>100</integer>
 		<integer>15</integer>
+		<integer>47</integer>
+		<integer>5</integer>
 		<integer>0</integer>
 		<integer>35</integer>
 		<integer>25</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -8,6 +8,8 @@
 		<integer>45</integer>
 		<integer>100</integer>
 		<integer>15</integer>
+		<integer>47</integer>
+		<integer>5</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>25</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -4,10 +4,12 @@
 <dict>
 	<key>basic</key>
 	<array>
-		<integer>150</integer>
+		<integer>50</integer>
 		<integer>30</integer>
-		<integer>50</integer>
+		<integer>150</integer>
 		<integer>15</integer>
+		<integer>47</integer>
+		<integer>5</integer>
 		<integer>0</integer>
 		<integer>35</integer>
 		<integer>25</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -8,6 +8,8 @@
 		<integer>15</integer>
 		<integer>100</integer>
 		<integer>15</integer>
+		<integer>47</integer>
+		<integer>5</integer>
 		<integer>0</integer>
 		<integer>35</integer>
 		<integer>25</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -8,6 +8,8 @@
 		<integer>300</integer>
 		<integer>100</integer>
 		<integer>50</integer>
+		<integer>47</integer>
+		<integer>5</integer>
 		<integer>1</integer>
 		<integer>0</integer>
 		<integer>35</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -7,7 +7,9 @@
 		<integer>100</integer>
 		<integer>100</integer>
 		<integer>100</integer>
-		<integer>999</integer>
+		<integer>100</integer>
+		<integer>47</integer>
+		<integer>5</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>30</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -8,6 +8,8 @@
 		<integer>30</integer>
 		<integer>100</integer>
 		<integer>15</integer>
+		<integer>47</integer>
+		<integer>5</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>25</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist	Mon Nov 08 23:16:13 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist	Mon Nov 08 23:59:21 2010 +0100
@@ -3,30 +3,10 @@
 <plist version="1.0">
 <array>
 	<dict>
-		<key>default</key>
-		<integer>100</integer>
-		<key>image</key>
-		<string>Damage</string>
-		<key>max</key>
-		<integer>300</integer>
-		<key>min</key>
-		<integer>10</integer>
-		<key>title</key>
-		<string>Damage Modifier</string>
-	</dict>
-	<dict>
-		<key>default</key>
-		<integer>45</integer>
-		<key>image</key>
-		<string>Time</string>
-		<key>max</key>
-		<integer>100</integer>
-		<key>min</key>
-		<integer>1</integer>
-		<key>title</key>
-		<string>Turn Time</string>
-	</dict>
-	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string></string>
 		<key>default</key>
 		<integer>100</integer>
 		<key>image</key>
@@ -39,18 +19,90 @@
 		<string>Initial Health</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<true/>
+		<key>command</key>
+		<string>e$turntime</string>
+		<key>default</key>
+		<integer>45</integer>
+		<key>image</key>
+		<string>Time</string>
+		<key>max</key>
+		<integer>100</integer>
+		<key>min</key>
+		<integer>1</integer>
+		<key>title</key>
+		<string>Turn Time</string>
+	</dict>
+	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$damagepct</string>
+		<key>default</key>
+		<integer>100</integer>
+		<key>image</key>
+		<string>Damage</string>
+		<key>max</key>
+		<integer>300</integer>
+		<key>min</key>
+		<integer>10</integer>
+		<key>title</key>
+		<string>Damage Modifier</string>
+	</dict>
+	<dict>
+		<key>checkOverMax</key>
+		<true/>
+		<key>command</key>
+		<string>e$sd_turns</string>
 		<key>default</key>
 		<integer>15</integer>
 		<key>image</key>
 		<string>SuddenDeath</string>
 		<key>max</key>
-		<integer>999</integer>
+		<integer>50</integer>
 		<key>min</key>
 		<integer>0</integer>
 		<key>title</key>
 		<string>Sudden Death Timeout</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$waterrise</string>
+		<key>default</key>
+		<integer>47</integer>
+		<key>image</key>
+		<string>SuddenDeath</string>
+		<key>max</key>
+		<integer>100</integer>
+		<key>min</key>
+		<integer>0</integer>
+		<key>title</key>
+		<string>Water Rise Amount</string>
+	</dict>
+	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$healthdec</string>
+		<key>default</key>
+		<integer>5</integer>
+		<key>image</key>
+		<string>SuddenDeath</string>
+		<key>max</key>
+		<integer>100</integer>
+		<key>min</key>
+		<integer>0</integer>
+		<key>title</key>
+		<string>Health Decrease</string>
+	</dict>
+	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$casefreq</string>
 		<key>default</key>
 		<integer>5</integer>
 		<key>image</key>
@@ -60,9 +112,13 @@
 		<key>min</key>
 		<integer>0</integer>
 		<key>title</key>
-		<string>Crate Drops</string>
+		<string>Crate Drop Turns</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$healthprob</string>
 		<key>default</key>
 		<integer>35</integer>
 		<key>image</key>
@@ -75,6 +131,10 @@
 		<string>Health Kit Probability</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$hcaseamount</string>
 		<key>default</key>
 		<integer>25</integer>
 		<key>image</key>
@@ -87,6 +147,10 @@
 		<string>Health Amount in Kit</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$minestime</string>
 		<key>default</key>
 		<integer>3</integer>
 		<key>image</key>
@@ -99,6 +163,10 @@
 		<string>Mines Time</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$minesnum</string>
 		<key>default</key>
 		<integer>4</integer>
 		<key>image</key>
@@ -111,6 +179,10 @@
 		<string>Mines Number</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$minedudpct</string>
 		<key>default</key>
 		<integer>0</integer>
 		<key>image</key>
@@ -123,6 +195,10 @@
 		<string>Dud Mines Probability</string>
 	</dict>
 	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
+		<string>e$explosives</string>
 		<key>default</key>
 		<integer>2</integer>
 		<key>image</key>
--- a/share/hedgewars/Data/Locale/en.txt	Mon Nov 08 23:16:13 2010 +0100
+++ b/share/hedgewars/Data/Locale/en.txt	Mon Nov 08 23:59:21 2010 +0100
@@ -499,7 +499,7 @@
 05:11=Shared Ammo: All teams of the same color share their ammunition
 05:12=Mine Timers: Mines will detonate after %1 second(s)
 05:13=Mine Timers: Mines will detonate instantly
-05:14=Mine Timers: Mines will detonate after 0 - 3 seconds
+05:14=Mine Timers: Mines will detonate after 0 - 5 seconds
 05:15=Damage Modifier: All weapons will do %1% damage
 05:16=Health of all hogs is reset on end of turn
 05:17=AI hogs respawn on death