# HG changeset patch
# User koda
# Date 1291589338 -3600
# Node ID 1fe77f2bc1d177fcfed9f6f14b30a81e4745eff2
# Parent 018b5642b87382f1d9ece88944c8b1a47582354b
update schemes for ios
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Classes/CreationChamber.m
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.m Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.m Sun Dec 05 23:48:58 2010 +0100
@@ -152,6 +152,7 @@
[NSNumber numberWithInt:15], //suddendeathtimeout
[NSNumber numberWithInt:47], //waterrise
[NSNumber numberWithInt:5], //healthdecrease
+ [NSNumber numberWithInt:100], //ropelength
[NSNumber numberWithInt:5], //cratedrops
[NSNumber numberWithInt:35], //healthprob
[NSNumber numberWithInt:25], //healthamount
@@ -184,6 +185,7 @@
[NSNumber numberWithBool:NO], //resetweaps
[NSNumber numberWithBool:NO], //perhogammo
[NSNumber numberWithBool:NO], //nowind
+ [NSNumber numberWithBool:NO], //morewind
nil];
NSMutableDictionary *theScheme = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Classes/MainMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m Sun Dec 05 23:48:58 2010 +0100
@@ -37,7 +37,6 @@
// check if some configuration files are already set; if they are present it means that the current copy must be updated
-(void) createNecessaryFiles {
- NSString *sourceFile, *destinationFile;
NSString *resourcesDir = [[NSBundle mainBundle] resourcePath];
DLog(@"Creating necessary files");
@@ -69,31 +68,21 @@
// we copy teams only the first time because it's unlikely that newer ones are going to be added
NSString *baseTeamsDir = [[NSString alloc] initWithFormat:@"%@/Settings/Teams/",resourcesDir];
for (NSString *str in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:baseTeamsDir error:NULL]) {
- sourceFile = [baseTeamsDir stringByAppendingString:str];
- destinationFile = [TEAMS_DIRECTORY() stringByAppendingString:str];
+ NSString *sourceFile = [baseTeamsDir stringByAppendingString:str];
+ NSString *destinationFile = [TEAMS_DIRECTORY() stringByAppendingString:str];
[[NSFileManager defaultManager] removeItemAtPath:destinationFile error:NULL];
[[NSFileManager defaultManager] copyItemAtPath:sourceFile toPath:destinationFile error:NULL];
}
[baseTeamsDir release];
}
- // TODO: is merge needed?
+ // merge not needed as format rarely changes
- // SCHEMES - update old stuff and add new stuff
- if ([[NSFileManager defaultManager] fileExistsAtPath:SCHEMES_DIRECTORY()] == NO)
- [[NSFileManager defaultManager] createDirectoryAtPath:SCHEMES_DIRECTORY()
- withIntermediateDirectories:YES
- attributes:nil
- error:NULL];
- // TODO: do the merge if necessary
- // we overwrite the default ones because it is likely that new modes are added every release
+ // SCHEMES - always overwrite and delete custom ones
+ if ([[NSFileManager defaultManager] fileExistsAtPath:SCHEMES_DIRECTORY()] == YES)
+ [[NSFileManager defaultManager] removeItemAtPath:SCHEMES_DIRECTORY() error:NULL];
NSString *baseSchemesDir = [[NSString alloc] initWithFormat:@"%@/Settings/Schemes/",resourcesDir];
- for (NSString *str in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:baseSchemesDir error:NULL]) {
- sourceFile = [baseSchemesDir stringByAppendingString:str];
- destinationFile = [SCHEMES_DIRECTORY() stringByAppendingString:str];
- [[NSFileManager defaultManager] removeItemAtPath:destinationFile error:NULL];
- [[NSFileManager defaultManager] copyItemAtPath:sourceFile toPath:destinationFile error:NULL];
- }
- [baseSchemesDir release];
+ [[NSFileManager defaultManager] copyItemAtPath:baseSchemesDir toPath:SCHEMES_DIRECTORY() error:NULL];
+
// WEAPONS - always overwrite
if ([[NSFileManager defaultManager] fileExistsAtPath:WEAPONS_DIRECTORY()] == NO)
@@ -108,6 +97,7 @@
createWeaponNamed(@"Clean Slate", 4);
createWeaponNamed(@"Minefield", 5);
createWeaponNamed(@"Thinking with Portals", 6);
+ // merge not needed because weapons not present in the set are 0ed by GameSetup
DLog(@"Success");
}
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Sun Dec 05 23:48:58 2010 +0100
@@ -1555,7 +1555,7 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 1D6058900D05DD3D006BFB54 /* Test Lua */ = {
+ 1D6058900D05DD3D006BFB54 /* Hedgewars */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hedgewars" */;
buildPhases = (
@@ -1646,7 +1646,7 @@
);
projectRoot = "";
targets = (
- 1D6058900D05DD3D006BFB54 /* Test Lua */,
+ 1D6058900D05DD3D006BFB54 /* Hedgewars */,
928301160F10CAFC00CC5A3C /* fpc */,
6179928B114AE0C800BA94A9 /* UpdateDataFolder */,
);
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
0
35
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
5
35
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
5
35
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
5
35
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Sun Dec 05 23:48:58 2010 +0100
@@ -0,0 +1,49 @@
+
+
+
+
+ basic
+
+ 100
+ 45
+ 100
+ 15
+ 47
+ 5
+ 100
+ 5
+ 35
+ 25
+ 3
+ 4
+ 0
+ 2
+
+ gamemod
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
0
35
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
0
35
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
50
47
5
+ 100
1
0
35
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
2
25
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
100
47
5
+ 100
5
35
30
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Sun Dec 05 23:48:58 2010 +0100
@@ -10,6 +10,7 @@
15
47
5
+ 100
5
35
25
@@ -42,6 +43,7 @@
+
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Sun Dec 05 23:48:58 2010 +0100
@@ -102,6 +102,22 @@
checkOverMax
command
+ e$ropepct
+ default
+ 100
+ image
+ Rope
+ max
+ 999
+ min
+ 25
+ title
+ Rope Length
+
+
+ checkOverMax
+
+ command
e$casefreq
default
5
diff -r 018b5642b873 -r 1fe77f2bc1d1 project_files/HedgewarsMobile/Resources/Settings/iFrontend/gameFlags_en.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/gameFlags_en.plist Sun Dec 05 19:00:41 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/gameFlags_en.plist Sun Dec 05 23:48:58 2010 +0100
@@ -172,11 +172,19 @@
description
- Wind will not affect weapons
+ You will not have to worry about wind any more
image
NoWind
title
Disable Wind
+
+ description
+ Wind will affect almost everything
+ image
+ MoreWind
+ title
+ More Wind
+