From a98eda12a5c8d025a0dcf234916b047d76f06c39 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 21 Oct 2009 13:27:41 +0000 Subject: [PATCH] - Moved the new cover properties to section "JA2 Tactical Section" - Updated texts for new cover system - Updated build number to 3274 - New exe release build: 3274 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3274 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 23 +++++++++++++---------- GameVersion.cpp | 6 +++--- TileEngine/Buildings.cpp | 4 +++- Utils/_Ja25ChineseText.cpp | 6 +++--- Utils/_Ja25DutchText.cpp | 6 +++--- Utils/_Ja25EnglishText.cpp | 6 +++--- Utils/_Ja25FrenchText.cpp | 6 +++--- Utils/_Ja25GermanText.cpp | 4 ++-- Utils/_Ja25ItalianText.cpp | 6 +++--- Utils/_Ja25PolishText.cpp | 6 +++--- Utils/_Ja25RussianText.cpp | 6 +++--- Utils/_Ja25TaiwaneseText.cpp | 6 +++--- ja2_2005Express.vcproj | 12 ++++++------ 13 files changed, 51 insertions(+), 46 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 943f22aa..91d556c5 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -735,6 +735,18 @@ void LoadGameExternalOptions() // Silence the RT sneaking messages gGameExternalOptions.fQuietRealTimeSneak = iniReader.ReadBoolean("JA2 Tactical Settings","QUIET_REAL_TIME_SNEAK", FALSE); + // CPT: Cover System Settings + gGameExternalOptions.ubStealthTraitCoverValue = iniReader.ReadInteger("JA2 Tactical Settings","STEALTH_TRAIT_COVER_VALUE", 15, 0, 100); + gGameExternalOptions.ubStealthEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STEALTH_EFFECTIVENESS", 50, 0, 100); + gGameExternalOptions.ubTreeCoverEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings","TREE_COVER_EFFECTIVENESS", 50, 0, 100); + gGameExternalOptions.ubCamouflageEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "CAMOUFLAGE_EFFECTIVENESS", 50, 0, 100); + gGameExternalOptions.ubCoverDisplayUpdateWait = iniReader.ReadInteger("JA2 Tactical Settings", "COVER_DISPLAY_UPDATE_WAIT", 500, -1, 10000); + + gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE); + gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE); + gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "LBE_SIGHT_ADJUSTMENT", TRUE); + + //################# Rain Settings ################## // Rain settings @@ -1006,16 +1018,7 @@ void LoadGameExternalOptions() // HEADROCK HAM B2.4 gGameExternalOptions.iMineIncomePercentage = iniReader.ReadInteger("JA2 HAM Settings","MINE_INCOME_PERCENTAGE", 100, 1, 1000); - // CPT: Cover System Settings - gGameExternalOptions.ubStealthTraitCoverValue = iniReader.ReadInteger("JA2 Gameplay Settings","STEALTH_TRAIT_COVER_VALUE", 15, 0, 100); - gGameExternalOptions.ubStealthEffectiveness = iniReader.ReadInteger("JA2 Gameplay Settings", "STEALTH_EFFECTIVENESS", 50, 0, 100); - gGameExternalOptions.ubTreeCoverEffectiveness = iniReader.ReadInteger("JA2 Gameplay Settings","TREE_COVER_EFFECTIVENESS", 50, 0, 100); - gGameExternalOptions.ubCamouflageEffectiveness = iniReader.ReadInteger("JA2 Gameplay Settings", "CAMOUFLAGE_EFFECTIVENESS", 50, 0, 100); - gGameExternalOptions.ubCoverDisplayUpdateWait = iniReader.ReadInteger("JA2 Gameplay Settings", "COVER_DISPLAY_UPDATE_WAIT", 500, -1, 10000); - - gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Gameplay Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE); - gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Gameplay Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE); - gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Gameplay Settings", "LBE_SIGHT_ADJUSTMENT", TRUE); + // HEADROCK HAM B1: Set minimum and maximum CTH gGameExternalOptions.iMaximumCTH = iniReader.ReadInteger("JA2 HAM Settings","MAXIMUM_POSSIBLE_CTH",99); diff --git a/GameVersion.cpp b/GameVersion.cpp index 1cc29fff..ab902703 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -18,7 +18,7 @@ CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.3023" }; #elif defined JA2BETAVERSION //BETA/TEST BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Debug v1.13.3272" }; +CHAR16 zVersionLabel[256] = { L"Debug v1.13.3274" }; #elif defined CRIPPLED_VERSION @@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - CHAR16 zVersionLabel[256] = { L"Release v1.13.3272" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.3274" }; #endif -CHAR8 czVersionNumber[16] = { "Build 09.10.19" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 09.10.21" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; diff --git a/TileEngine/Buildings.cpp b/TileEngine/Buildings.cpp index 09abade0..59eeb6da 100644 --- a/TileEngine/Buildings.cpp +++ b/TileEngine/Buildings.cpp @@ -288,7 +288,7 @@ INT32 iLoopCount = 0; { bSkipSpots--; } - else if ( Random( uiChanceIn ) == 0 ) + else /*if ( Random( uiChanceIn ) == 0 )*/ { pBuilding->sUpClimbSpots[ pBuilding->ubNumClimbSpots ] = sCurrGridNo; pBuilding->sDownClimbSpots[ pBuilding->ubNumClimbSpots ] = sRightGridNo; @@ -308,6 +308,7 @@ INT32 iLoopCount = 0; // skip the next spot bSkipSpots = 1; } + /* else { // didn't pick this location, so increase chance that next location @@ -317,6 +318,7 @@ INT32 iLoopCount = 0; uiChanceIn--; } } + */ } else diff --git a/Utils/_Ja25ChineseText.cpp b/Utils/_Ja25ChineseText.cpp index fec085ef..8d4f1c16 100644 --- a/Utils/_Ja25ChineseText.cpp +++ b/Utils/_Ja25ChineseText.cpp @@ -109,9 +109,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/Utils/_Ja25DutchText.cpp b/Utils/_Ja25DutchText.cpp index 820c8af4..454cad9e 100644 --- a/Utils/_Ja25DutchText.cpp +++ b/Utils/_Ja25DutchText.cpp @@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/Utils/_Ja25EnglishText.cpp b/Utils/_Ja25EnglishText.cpp index 42a2ee2a..5c8453bb 100644 --- a/Utils/_Ja25EnglishText.cpp +++ b/Utils/_Ja25EnglishText.cpp @@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/Utils/_Ja25FrenchText.cpp b/Utils/_Ja25FrenchText.cpp index 72ac7557..17ce38c0 100644 --- a/Utils/_Ja25FrenchText.cpp +++ b/Utils/_Ja25FrenchText.cpp @@ -75,9 +75,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/Utils/_Ja25GermanText.cpp b/Utils/_Ja25GermanText.cpp index e06775a9..3c54412c 100644 --- a/Utils/_Ja25GermanText.cpp +++ b/Utils/_Ja25GermanText.cpp @@ -75,8 +75,8 @@ STR16 gzDisplayCoverText[]= L"Deckung: %d/100 %s, Helligkeit: %d/100", L"Waffen-Rchwt.: %d/%d Felder, Trefferwahrsch.: %d/100", L"Deckungsanzeige ausschalten", - L"Zeige Söldneransicht", - L"Zeige Deckung für Söldner", + L"Zeige Ansicht für Söldner", + L"Zeige Gefahrenbereich für Söldner", L"Wald", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Stadt", L"Wüste", diff --git a/Utils/_Ja25ItalianText.cpp b/Utils/_Ja25ItalianText.cpp index 11ea1e54..6c309638 100644 --- a/Utils/_Ja25ItalianText.cpp +++ b/Utils/_Ja25ItalianText.cpp @@ -75,9 +75,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/Utils/_Ja25PolishText.cpp b/Utils/_Ja25PolishText.cpp index 9413b62f..079f784f 100644 --- a/Utils/_Ja25PolishText.cpp +++ b/Utils/_Ja25PolishText.cpp @@ -75,9 +75,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/Utils/_Ja25RussianText.cpp b/Utils/_Ja25RussianText.cpp index a7ebbc3c..dedbfb58 100644 --- a/Utils/_Ja25RussianText.cpp +++ b/Utils/_Ja25RussianText.cpp @@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/Utils/_Ja25TaiwaneseText.cpp b/Utils/_Ja25TaiwaneseText.cpp index 66632e99..af0012e1 100644 --- a/Utils/_Ja25TaiwaneseText.cpp +++ b/Utils/_Ja25TaiwaneseText.cpp @@ -74,9 +74,9 @@ STR16 gzDisplayCoverText[]= { L"Cover: %d/100 %s, Brightness: %d/100", L"Gun Range: %d/%d tiles, Chance to hit: %d/100", - L"Disabling Cover Display", - L"Showing Mercenary View", - L"Showing Cover for Mercenary", + L"Disabling cover display", + L"Showing mercenary view", + L"Showing danger zones for mercenary", L"Wood", // wanted to use jungle , but wood is shorter in german too (dschungel vs wald) L"Urban", L"Desert", diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj index c9558c63..bc1eb8b1 100644 --- a/ja2_2005Express.vcproj +++ b/ja2_2005Express.vcproj @@ -17,7 +17,7 @@