# HG changeset patch
# User koda
# Date 1283384956 -7200
# Node ID e4a8a4e378deed1eec2caf686a2b2632284bdbd8
# Parent 2ccfc93c6b5e0ac4b772f65dfe131f6c454ddafc
remove now useless toggle, add ai team
diff -r 2ccfc93c6b5e -r e4a8a4e378de hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas Wed Sep 01 19:31:32 2010 -0400
+++ b/hedgewars/hwengine.pas Thu Sep 02 01:49:16 2010 +0200
@@ -227,8 +227,7 @@
isSoundEnabled:= gameArgs[6] = '1';
isMusicEnabled:= gameArgs[7] = '1';
cAltDamage:= gameArgs[8] = '1';
- if CompareStr(gameArgs[9],'0') = 0 then
- cReadyDelay:= 0;
+ //gameArgs[9] unused
recordFileName:= gameArgs[10];
{$ENDIF}
diff -r 2ccfc93c6b5e -r e4a8a4e378de project_files/HedgewarsMobile/Classes/GameSetup.m
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Sep 01 19:31:32 2010 -0400
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Thu Sep 02 01:49:16 2010 +0200
@@ -407,7 +407,7 @@
gameArgs[ 6] = [[[self.systemSettings objectForKey:@"sound"] stringValue] UTF8String]; //isSoundEnabled
gameArgs[ 7] = [[[self.systemSettings objectForKey:@"music"] stringValue] UTF8String]; //isMusicEnabled
gameArgs[ 8] = [[[self.systemSettings objectForKey:@"alternate"] stringValue] UTF8String]; //cAltDamage
- gameArgs[ 9] = [[[self.systemSettings objectForKey:@"ready"] stringValue] UTF8String]; //cReady
+ gameArgs[ 9] = NULL; //unused
gameArgs[10] = NULL; //recordFileName
[wSize release];
diff -r 2ccfc93c6b5e -r e4a8a4e378de project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m
--- a/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Wed Sep 01 19:31:32 2010 -0400
+++ b/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m Thu Sep 02 01:49:16 2010 +0200
@@ -94,7 +94,7 @@
return 2;
break;
case 2: // other stuff
- return 2;
+ return 1;
break;
default:
break;
@@ -106,7 +106,7 @@
NSString *sectionTitle = nil;
switch (section) {
case 0:
- sectionTitle = NSLocalizedString(@"Network Configuration", @"");
+ sectionTitle = NSLocalizedString(@"Main Configuration", @"");
break;
case 1:
sectionTitle = NSLocalizedString(@"Audio Preferences", @"");
@@ -193,14 +193,16 @@
switchContent = (UISwitch *)cell.accessoryView;
if (row == 0) {
cell.textLabel.text = NSLocalizedString(@"Alternate Damage", @"");
- cell.detailTextLabel.text = NSLocalizedString(@"Damage will popup when the hedgehog is injured", @"");
+ cell.detailTextLabel.text = NSLocalizedString(@"A damage popup will appear when a hedgehog is injured", @"");
switchContent.on = [[self.settingsDictionary objectForKey:@"alternate"] boolValue];
switchContent.tag = 30;
} else {
+ /*
cell.textLabel.text = NSLocalizedString(@"Get Ready Dialogue", @"");
cell.detailTextLabel.text = NSLocalizedString(@"Pause for 5 seconds between turns",@"");
switchContent.on = [[self.settingsDictionary objectForKey:@"ready"] boolValue];
switchContent.tag = 60;
+ */
}
break;
default:
diff -r 2ccfc93c6b5e -r e4a8a4e378de project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Wed Sep 01 19:31:32 2010 -0400
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Thu Sep 02 01:49:16 2010 +0200
@@ -2027,7 +2027,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\n\n#delete forbidden maps\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese}\nrm -rf ${PROJECT_DIR}/Data/Themes/City/Flake.png\n\n#the following ones must be removed when their support is implemented\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Robot,Russian,Singer,Surfer}\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all reserved hats\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/";
+ shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n#delete forbidden maps\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,Island}\nrm -rf ${PROJECT_DIR}/Data/Themes/City/Flake.png\n\n#the following ones must be removed when their support is implemented\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Russian,Singer,Surfer}\n\n#delete all names\nrm -rf ${PROJECT_DIR}/Data/Names/\n\n#delete all missions\nrm -rf ${PROJECT_DIR}/Data/Missions/\n\n#delete all reserved hats\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/";
showEnvVarsInLog = 0;
};
9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {
diff -r 2ccfc93c6b5e -r e4a8a4e378de project_files/HedgewarsMobile/Resources/Settings/Teams/Ninjas.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Teams/Ninjas.plist Wed Sep 01 19:31:32 2010 -0400
+++ b/project_files/HedgewarsMobile/Resources/Settings/Teams/Ninjas.plist Thu Sep 02 01:49:16 2010 +0200
@@ -14,7 +14,7 @@
<array>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaFull</string>
<key>hogname</key>
<string>Ukemi</string>
<key>level</key>
@@ -22,7 +22,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaStraight</string>
<key>hogname</key>
<string>Godai</string>
<key>level</key>
@@ -30,7 +30,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaTriangle</string>
<key>hogname</key>
<string>Ninpo</string>
<key>level</key>
@@ -38,7 +38,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaStraight</string>
<key>hogname</key>
<string>Shinobi</string>
<key>level</key>
@@ -46,7 +46,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaFull</string>
<key>hogname</key>
<string>Tatsujin</string>
<key>level</key>
@@ -54,7 +54,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaTriangle</string>
<key>hogname</key>
<string>Arashi</string>
<key>level</key>
@@ -62,7 +62,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaStraight</string>
<key>hogname</key>
<string>Bushi</string>
<key>level</key>
@@ -70,7 +70,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>NinjaFull</string>
<key>hogname</key>
<string>Itami</string>
<key>level</key>
diff -r 2ccfc93c6b5e -r e4a8a4e378de project_files/HedgewarsMobile/Resources/Settings/Teams/Pirates.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Teams/Pirates.plist Wed Sep 01 19:31:32 2010 -0400
+++ b/project_files/HedgewarsMobile/Resources/Settings/Teams/Pirates.plist Thu Sep 02 01:49:16 2010 +0200
@@ -14,7 +14,7 @@
<array>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>pirate_jack_bandana</string>
<key>hogname</key>
<string>Toothless Wayne</string>
<key>level</key>
@@ -22,7 +22,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>pirate_jack</string>
<key>hogname</key>
<string>Long-nose Kidd</string>
<key>level</key>
@@ -30,7 +30,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>dwarf</string>
<key>hogname</key>
<string>Eye-patch Jim</string>
<key>level</key>
@@ -38,7 +38,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>pirate_jack</string>
<key>hogname</key>
<string>Rackham Blood</string>
<key>level</key>
@@ -46,7 +46,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>dwarf</string>
<key>hogname</key>
<string>One-eyed Ayee</string>
<key>level</key>
@@ -54,7 +54,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>pirate_jack_bandana</string>
<key>hogname</key>
<string>Dirty Ben</string>
<key>level</key>
@@ -62,7 +62,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>pirate_jack</string>
<key>hogname</key>
<string>Morris</string>
<key>level</key>
@@ -70,7 +70,7 @@
</dict>
<dict>
<key>hat</key>
- <string>NoHat</string>
+ <string>dwarf</string>
<key>hogname</key>
<string>Cruise Seymour</string>
<key>level</key>
diff -r 2ccfc93c6b5e -r e4a8a4e378de project_files/HedgewarsMobile/Resources/Settings/Teams/Robots.plist
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/HedgewarsMobile/Resources/Settings/Teams/Robots.plist Thu Sep 02 01:49:16 2010 +0200
@@ -0,0 +1,83 @@
+<?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>flag</key>
+ <string>cm_binary</string>
+ <key>fort</key>
+ <string>UFO</string>
+ <key>grave</key>
+ <string>Rip</string>
+ <key>hash</key>
+ <string>0</string>
+ <key>hedgehogs</key>
+ <array>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>HAL</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>R2-D2</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>Wall-E</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>Robocob</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>Optimus Prime</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>C-3PO</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>Terminator</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ <dict>
+ <key>hat</key>
+ <string>cyborg</string>
+ <key>hogname</key>
+ <string>KITT</string>
+ <key>level</key>
+ <integer>4</integer>
+ </dict>
+ </array>
+ <key>voicepack</key>
+ <string>Robot</string>
+</dict>
+</plist>
diff -r 2ccfc93c6b5e -r e4a8a4e378de project_files/HedgewarsMobile/Resources/Settings/settings.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/settings.plist Wed Sep 01 19:31:32 2010 -0400
+++ b/project_files/HedgewarsMobile/Resources/Settings/settings.plist Thu Sep 02 01:49:16 2010 +0200
@@ -12,7 +12,5 @@
<true/>
<key>username</key>
<string></string>
- <key>ready</key>
- <true/>
</dict>
</plist>