From 6ad228e91eab41b3847005e4252dfa0b8dc5286a Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 26 Aug 2013 21:19:31 +0000 Subject: [PATCH] soldier tooltips now display energy and morale git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6323 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 4 +++- GameSettings.h | 2 ++ Tactical/SoldierTooltips.cpp | 6 +++++- Utils/Text.h | 2 ++ Utils/_ChineseText.cpp | 2 ++ Utils/_DutchText.cpp | 2 ++ Utils/_EnglishText.cpp | 2 ++ Utils/_FrenchText.cpp | 2 ++ Utils/_GermanText.cpp | 2 ++ Utils/_ItalianText.cpp | 2 ++ Utils/_PolishText.cpp | 2 ++ Utils/_RussianText.cpp | 2 ++ Utils/_TaiwaneseText.cpp | 2 ++ 13 files changed, 30 insertions(+), 2 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 9b47e519..c4644e81 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -52,7 +52,7 @@ #define GAME_SETTINGS_FILE "Ja2_Settings.INI" -#define GAME_EXTERNAL_OPTIONS_FILE "Ja2_Options.ini" +#define GAME_EXTERNAL_OPTIONS_FILE "Ja2_Options.ini" #define AP_BP_CONSTANTS_FILE "APBPConstants.ini" @@ -1147,6 +1147,8 @@ void LoadGameExternalOptions() gGameExternalOptions.fEnableSoldierTooltipAttitude = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_ATTITUDE", TRUE); gGameExternalOptions.fEnableSoldierTooltipActionPoints = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS", TRUE); gGameExternalOptions.fEnableSoldierTooltipHealth = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_HEALTH", TRUE); + gGameExternalOptions.fEnableSoldierTooltipEnergy = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_ENERGY", TRUE); + gGameExternalOptions.fEnableSoldierTooltipMorale = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_MORALE", TRUE); gGameExternalOptions.fEnableSoldierTooltipTraits = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_TRAITS", TRUE); // added by SANDRO gGameExternalOptions.fEnableSoldierTooltipHelmet = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_HELMET", TRUE); gGameExternalOptions.fEnableSoldierTooltipVest = iniReader.ReadBoolean("Tactical Tooltip Settings", "SOLDIER_TOOLTIP_DISPLAY_VEST", TRUE); diff --git a/GameSettings.h b/GameSettings.h index cace201a..7ae8f38b 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -692,6 +692,8 @@ typedef struct BOOLEAN fEnableSoldierTooltipAttitude; BOOLEAN fEnableSoldierTooltipActionPoints; BOOLEAN fEnableSoldierTooltipHealth; + BOOLEAN fEnableSoldierTooltipEnergy; + BOOLEAN fEnableSoldierTooltipMorale; BOOLEAN fEnableSoldierTooltipTraits; // added by SANDRO BOOLEAN fEnableSoldierTooltipHelmet; BOOLEAN fEnableSoldierTooltipVest; diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 4efa31e1..fa593bef 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -226,7 +226,11 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_APS], pStrInfo, pSoldier->bActionPoints ); if ( gGameExternalOptions.fEnableSoldierTooltipHealth ) swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_HEALTH], pStrInfo, pSoldier->stats.bLife ); - + if ( gGameExternalOptions.fEnableSoldierTooltipEnergy ) + swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_ENERGY], pStrInfo, pSoldier->bBreath ); + if ( gGameExternalOptions.fEnableSoldierTooltipMorale ) + swprintf( pStrInfo, gzTooltipStrings[STR_TT_CAT_CURRENT_MORALE], pStrInfo, pSoldier->aiData.bMorale ); + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Added by SANDRO - show enemy skills if ( gGameExternalOptions.fEnableSoldierTooltipTraits ) diff --git a/Utils/Text.h b/Utils/Text.h index edf2e6c7..5d63bf00 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -558,6 +558,8 @@ enum STR_TT_CAT_ATTITUDE, STR_TT_CAT_CURRENT_APS, STR_TT_CAT_CURRENT_HEALTH, + STR_TT_CAT_CURRENT_ENERGY, + STR_TT_CAT_CURRENT_MORALE, STR_TT_CAT_HELMET, STR_TT_CAT_VEST, STR_TT_CAT_LEGGINGS, diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index f81f0a4d..037cff11 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -6124,6 +6124,8 @@ STR16 gzTooltipStrings[] = L"%s|属|性: %d\n", L"%s|当|前 |A|Ps: %d\n", L"%s|当|前 |生|命: %d\n", + L"%s|Current |Breath: %d\n", // TODO.Translate + L"%s|Current |Morale: %d\n", // Full info L"%s|头|盔: %s\n", L"%s|防|弹|衣: %s\n", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index b6956dff..bcc80020 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -6130,6 +6130,8 @@ STR16 gzTooltipStrings[] = L"%s|Attitude: %d\n", L"%s|Current |A|Ps: %d\n", L"%s|Current |Health: %d\n", + L"%s|Current |Breath: %d\n", // TODO.Translate + L"%s|Current |Morale: %d\n", // Full info L"%s|Helmet: %s\n", L"%s|Vest: %s\n", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 87290f53..ab661c86 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -6124,6 +6124,8 @@ STR16 gzTooltipStrings[] = L"%s|Attitude: %d\n", L"%s|Current |A|Ps: %d\n", L"%s|Current |Health: %d\n", + L"%s|Current |Breath: %d\n", + L"%s|Current |Morale: %d\n", // Full info L"%s|Helmet: %s\n", L"%s|Vest: %s\n", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index b3eff380..bfd1e3b5 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -6121,6 +6121,8 @@ STR16 gzTooltipStrings[] = L"%s|Attitude: %d\n", L"%s|P|A |Actuel: %d\n", L"%s|Santé |Actuel: %d\n", + L"%s|Current |Breath: %d\n", // TODO.Translate + L"%s|Current |Morale: %d\n", // Full info L"%s|Casque: %s\n", L"%s|Veste: %s\n", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 6ce8ea9d..4a6d1258 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -5952,6 +5952,8 @@ STR16 gzTooltipStrings[] = L"%s|Gesinnung: %d\n", L"%s|Aktuelle |A|Ps: %d\n", L"%s|Aktuelle |Gesundheit: %d\n", + L"%s|Aktueller |Atem: %d\n", + L"%s|Aktuelle |Moral: %d\n", // Full info L"%s|Helm: %s\n", L"%s|Weste: %s\n", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 47850e74..5e68aaea 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -6116,6 +6116,8 @@ STR16 gzTooltipStrings[] = L"%s|Attitude: %d\n", L"%s|Current |A|Ps: %d\n", L"%s|Current |Health: %d\n", + L"%s|Current |Breath: %d\n", // TODO.Translate + L"%s|Current |Morale: %d\n", // Full info L"%s|Helmet: %s\n", L"%s|Vest: %s\n", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index d5d894cb..46863d35 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -6131,6 +6131,8 @@ STR16 gzTooltipStrings[] = L"%s|Postawa: %d\n", L"%s|Aktualne |P|A: %d\n", L"%s|Aktualne |Zdrowie: %d\n", + L"%s|Current |Breath: %d\n", // TODO.Translate + L"%s|Current |Morale: %d\n", // Full info L"%s|Hełm: %s\n", L"%s|Kamizelka: %s\n", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 20bf4bf7..767e9d2c 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -6123,6 +6123,8 @@ STR16 gzTooltipStrings[] = L"%s|Настрой: %d\n", L"%s|Текущие |A|Ps: %d\n", L"%s|Текущее |Здоровье: %d\n", + L"%s|Current |Breath: %d\n", // TODO.Translate + L"%s|Current |Morale: %d\n", // Full info L"%s|Каска: %s\n", L"%s|Жилет: %s\n", diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index b9305438..626b56dd 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -6133,6 +6133,8 @@ STR16 gzTooltipStrings[] = L"%s|Attitude: %d\n", L"%s|Current |A|Ps: %d\n", L"%s|Current |Health: %d\n", + L"%s|Current |Breath: %d\n", // TODO.Translate + L"%s|Current |Morale: %d\n", // Full info L"%s|Helmet: %s\n", L"%s|Vest: %s\n",