From 819b94ecf9f0c50b2cba19dd59f11283f4629d09 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 29 May 2006 18:41:06 +0000
Subject: [PATCH] - changed tool tips for launchers and armor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@132 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp              |  2 +-
 JA2.vcproj                   |  4 +--
 Tactical/Interface Items.cpp | 48 +++++++++++++++++++++++++++++++++---
 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 ++
 10 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index e6c6319b..338edf47 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,7 +23,7 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.128" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.132" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index 1fa6c17e..17c964ef 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.128_2006_05_29.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.132_2006_05_29.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.128_2006_05_29.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.132_2006_05_29.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 984f7f11..c5d0a56a 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -7320,7 +7320,7 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 		//Calculate AP's
 		INT16 apStr[20];
 
-		if ( Item[ usItem ].usItemClass == IC_GUN && !Item[usItem].rocketlauncher && !Item[usItem].rocketrifle )
+		if ( Item[ usItem ].usItemClass == IC_GUN )//&& !Item[usItem].rocketlauncher && !Item[usItem].rocketrifle )
 		{
 			INT16 apStr2[20];
 			UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject );
@@ -7353,7 +7353,7 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 		}
 
 		//Info for weapons
-		if ( Item[ usItem ].usItemClass == IC_GUN && !Item[usItem].rocketlauncher && !Item[usItem].rocketrifle )
+		if ( Item[ usItem ].usItemClass == IC_GUN )//&& !Item[usItem].rocketlauncher && !Item[usItem].rocketrifle )
 		{			
 			swprintf( (wchar_t *)pStr, L"%s (%s) [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", 
 				ItemNames[ usItem ], 
@@ -7374,6 +7374,7 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 				);
 		}
 
+
 		// The next is for ammunition which gets the measurement 'rnds'
 		else if (Item[ usItem ].usItemClass == IC_AMMO)
 		{
@@ -7417,12 +7418,51 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 				);
 		}
 
+		//Armor
+		else if (Item[ usItem ].usItemClass == IC_ARMOUR)
+		{
+			INT32 iProtection = EffectiveArmour( pObject );
+			
+			switch( Armour[ Item[ usItem ].ubClassIndex ].ubArmourClass )
+			{
+			case( ARMOURCLASS_HELMET ):
+				iProtection = 15 * iProtection / Armour[ Item[ SPECTRA_HELMET_18 ].ubClassIndex ].ubProtection;
+				break;
+
+			case( ARMOURCLASS_VEST ):
+				iProtection = 65 * iProtection / ( Armour[ Item[ SPECTRA_VEST_18 ].ubClassIndex ].ubProtection + Armour[ Item[ CERAMIC_PLATES ].ubClassIndex ].ubProtection );
+				break;
+
+			case( ARMOURCLASS_LEGGINGS ):
+				iProtection = 25 * iProtection / Armour[ Item[ SPECTRA_LEGGINGS_18 ].ubClassIndex ].ubProtection;
+				break;
+
+			case( ARMOURCLASS_PLATE ):
+				iProtection = 65 * iProtection / ( Armour[ Item[ CERAMIC_PLATES ].ubClassIndex ].ubProtection );
+				break;
+			}
+
+			swprintf( (wchar_t *)pStr, L"%s [%d %%]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s", 				
+				ItemNames[ usItem ],		//Item long name
+				sValue,						//Item condition
+				pInvPanelTitleStrings[ 4 ],	//Protection string
+				iProtection,				//Protection rating in % based on best armor
+				Armour[ Item[ usItem ].ubClassIndex ].ubProtection, //Protection (raw data)
+				Armour[ Item[ usItem ].ubClassIndex ].ubProtection * sValue / 100,
+				pInvPanelTitleStrings[ 3 ],	//Camo string
+				Item[ usItem ].camobonus,	//Camo bonus
+				gWeaponStatsDesc[ 12 ],		//Weight string
+				fWeight,					//Weight
+				GetWeightUnitString()		//Weight units
+				);
+		}
+
 		// The final, and typical case, is that of an item with a percent status
 		else
 		{
 			swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %1.1f %s", 
-				ItemNames[ usItem ], 
-				sValue, 
+				ItemNames[ usItem ],		//Item long name
+				sValue,						//Item condition
 				gWeaponStatsDesc[ 12 ],		//Weight String
 				fWeight,					//Weight
 				GetWeightUnitString()		//Weight units
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index 720c9e56..6b3873a2 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -523,6 +523,8 @@ STR16 pInvPanelTitleStrings[] =
 	L"Wapen", // the armor rating of the merc
 	L"Gew.", // the weight the merc is carrying
 	L"Camo", // the merc's camouflage rating
+	L"Camouflage:",
+	L"Protection:",
 };
 
 STR16 pShortAttributeStrings[] =
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 1cd33447..e8fd63ee 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -537,6 +537,8 @@ STR16 pInvPanelTitleStrings[] =
 	L"Armor", // the armor rating of the merc
 	L"Weight", // the weight the merc is carrying
 	L"Camo", // the merc's camouflage rating
+	L"Camouflage:",
+	L"Protection:",
 };
 
 STR16 pShortAttributeStrings[] =
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index 6072d29c..1d451462 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -529,6 +529,8 @@ STR16 pInvPanelTitleStrings[] =
 	L"Armure", // the armor rating of the merc
 	L"Poids", // the weight the merc is carrying
 	L"Cam.", // the merc's camouflage rating
+	L"Camouflage:",
+	L"Protection:",
 };
 
 STR16 pShortAttributeStrings[] =
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index fcc1fbf6..22993eb4 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -514,6 +514,8 @@ STR16 pInvPanelTitleStrings[] =
 	L"Rüstung", // the armor rating of the merc
 	L"Gewicht", // the weight the merc is carrying
 	L"Tarnung", // the merc's camouflage rating
+	L"Tarnung:",
+	L"Rüstung:",
 };
 
 STR16 pShortAttributeStrings[] =
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 19f85271..50ecc98e 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -522,6 +522,8 @@ STR16 pInvPanelTitleStrings[] =
 	L"Giubb. A-P", // the armor rating of the merc
 	L"Peso", // the weight the merc is carrying
 	L"Trav.", // the merc's camouflage rating
+	L"Camouflage:",
+	L"Protection:",
 };
 
 STR16 pShortAttributeStrings[] =
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index 9d889b6d..5b3926f4 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -523,6 +523,8 @@ STR16 pInvPanelTitleStrings[] =
 	L"Os³ona", // the armor rating of the merc
 	L"Ekwip.", // the weight the merc is carrying
 	L"Kamuf.", // the merc's camouflage rating
+	L"Camouflage:",
+	L"Protection:",
 };
 
 STR16 pShortAttributeStrings[] =
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index 7d2453f7..5d0acfeb 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -529,6 +529,8 @@ STR16 pInvPanelTitleStrings[] =
 	L"Áðîíÿ", // the armor rating of the merc
 	L"Âåñ", // the weight the merc is carrying
 	L"Êàìóôëÿæ", // the merc's camouflage rating
+	L"Êàìóôëÿæ:",
+	L"Áðîíÿ:",
 };
 
 STR16 pShortAttributeStrings[] =