Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update schemes for ios
authorkoda
Sun, 05 Dec 2010 23:48:58 +0100
changeset 4463 1fe77f2bc1d1
parent 4462 018b5642b873
child 4464 04b4f0c2a2fc
update schemes for ios
project_files/HedgewarsMobile/Classes/CreationChamber.m file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Classes/MainMenuViewController.m file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist file | annotate | diff | comparison | revisions
project_files/HedgewarsMobile/Resources/Settings/iFrontend/gameFlags_en.plist file | annotate | diff | comparison | revisions 
--- 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:
--- 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");
 }
--- 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 */,
 			);
--- 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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>0</integer>
 		<integer>35</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<true/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>basic</key>
+	<array>
+		<integer>100</integer>
+		<integer>45</integer>
+		<integer>100</integer>
+		<integer>15</integer>
+		<integer>47</integer>
+		<integer>5</integer>
+		<integer>100</integer>
+		<integer>5</integer>
+		<integer>35</integer>
+		<integer>25</integer>
+		<integer>3</integer>
+		<integer>4</integer>
+		<integer>0</integer>
+		<integer>2</integer>
+	</array>
+	<key>gamemod</key>
+	<array>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<true/>
+		<true/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+		<false/>
+	</array>
+</dict>
+</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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>0</integer>
 		<integer>35</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>0</integer>
 		<integer>35</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>50</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>1</integer>
 		<integer>0</integer>
 		<integer>35</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>2</integer>
 		<integer>25</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>100</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>30</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<true/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<integer>15</integer>
 		<integer>47</integer>
 		<integer>5</integer>
+		<integer>100</integer>
 		<integer>5</integer>
 		<integer>35</integer>
 		<integer>25</integer>
@@ -42,6 +43,7 @@
 		<false/>
 		<false/>
 		<false/>
+		<false/>
 	</array>
 </dict>
 </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 @@
 		<key>checkOverMax</key>
 		<false/>
 		<key>command</key>
+		<string>e$ropepct</string>
+		<key>default</key>
+		<integer>100</integer>
+		<key>image</key>
+		<string>Rope</string>
+		<key>max</key>
+		<integer>999</integer>
+		<key>min</key>
+		<integer>25</integer>
+		<key>title</key>
+		<string>Rope Length</string>
+	</dict>
+	<dict>
+		<key>checkOverMax</key>
+		<false/>
+		<key>command</key>
 		<string>e$casefreq</string>
 		<key>default</key>
 		<integer>5</integer>
--- 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 @@
 	</dict>
 	<dict>
 		<key>description</key>
-		<string>Wind will not affect weapons</string>
+		<string>You will not have to worry about wind any more</string>
 		<key>image</key>
 		<string>NoWind</string>
 		<key>title</key>
 		<string>Disable Wind</string>
 	</dict>
+	<dict>
+		<key>description</key>
+		<string>Wind will affect almost everything</string>
+		<key>image</key>
+		<string>MoreWind</string>
+		<key>title</key>
+		<string>More Wind</string>
+	</dict>
 </array>
 </plist>
hedgewars