# HG changeset patch
# User koda
# Date 1289257102 -3600
# Node ID 3875481fcc86ab7da0432fe0ce1ccc5f2ef9177a
# Parent 7dcbd236ca594a46016a1938859f82d5a5cbf246
smaller update (color and modes)
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Classes/CommodityFunctions.m
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m Mon Nov 08 23:58:22 2010 +0100
@@ -139,8 +139,8 @@
NSMutableArray *basicArray = [[NSMutableArray alloc] initWithObjects:
[NSNumber numberWithInt:100], //initialhealth
+ [NSNumber numberWithInt:45], //turntime
[NSNumber numberWithInt:100], //damagemodifier
- [NSNumber numberWithInt:45], //turntime
[NSNumber numberWithInt:15], //suddendeathtimeout
[NSNumber numberWithInt:47], //waterrise
[NSNumber numberWithInt:5], //healthdecrease
@@ -272,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];
}
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m Mon Nov 08 23:58:22 2010 +0100
@@ -31,8 +31,6 @@
#define checkValueString(detailString,labelSting,sliderRef); \
if ([labelSting isEqualToString:@"Turn Time"] && (NSInteger) sliderRef.value == 100) \
detailString = @"∞"; \
- else if ([labelSting isEqualToString:@"Sudden Death Timeout"] && (NSInteger) sliderRef.value == 100) \
- detailString = NSLocalizedString(@"Nvr",@"Short for 'Never'"); \
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) \
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Nov 08 23:58:22 2010 +0100
@@ -1482,7 +1482,7 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 1D6058900D05DD3D006BFB54 /* Test Lua */ = {
+ 1D6058900D05DD3D006BFB54 /* Hedgewars */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hedgewars" */;
buildPhases = (
@@ -1573,7 +1573,7 @@
);
projectRoot = "";
targets = (
- 1D6058900D05DD3D006BFB54 /* Test Lua */,
+ 1D6058900D05DD3D006BFB54 /* Hedgewars */,
928301160F10CAFC00CC5A3C /* fpc */,
6179928B114AE0C800BA94A9 /* UpdateDataFolder */,
);
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
basic
100
+ 30
100
- 30
15
47
5
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
basic
100
+ 45
100
- 45
15
47
5
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
basic
50
+ 30
150
- 30
15
47
5
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Mon Nov 08 23:58:22 2010 +0100
@@ -5,9 +5,9 @@
basic
100
+ 15
100
15
- 15
47
5
0
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
basic
100
+ 300
100
- 300
50
47
5
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Mon Nov 08 23:58:22 2010 +0100
@@ -5,8 +5,8 @@
basic
100
+ 30
100
- 30
15
47
5
diff -r 7dcbd236ca59 -r 3875481fcc86 project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Mon Nov 08 23:46:34 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Mon Nov 08 23:58:22 2010 +0100
@@ -20,6 +20,22 @@
checkOverMax
+
+ command
+ e$turntime
+ default
+ 45
+ image
+ Time
+ max
+ 100
+ min
+ 1
+ title
+ Turn Time
+
+
+ checkOverMax
command
e$damagepct
@@ -38,29 +54,13 @@
checkOverMax
command
- e$turntime
- default
- 45
- image
- Time
- max
- 100
- min
- 1
- title
- Turn Time
-
-
- checkOverMax
-
- command
e$sd_turns
default
15
image
SuddenDeath
max
- 100
+ 50
min
0
title