From 979423c07af89fa18c60065f69feb07b5db5c984 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 5 Jun 2006 09:22:34 +0000
Subject: [PATCH] - removed ammo from grenade launcher tool tip

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@174 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp              |  2 +-
 JA2.vcproj                   |  4 +--
 Tactical/Interface Items.cpp | 54 ++++++++++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 480122b9..a7257ecd 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.170" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.174" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index 77230029..0c127830 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.170_2006_06_04.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.175_2006_06_05.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.170_2006_06_04.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.175_2006_06_05.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 8a93ad97..a1d227b5 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -7323,7 +7323,6 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 			break;
 
 		case IC_GUN:
-		case IC_LAUNCHER:
 			{
 				//Calculate AP's
 				INT16 apStr[20];
@@ -7362,8 +7361,57 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 					gWeaponStatsDesc[ 11 ],		//Damage String
 					GetDamage(pObject), 
 					gWeaponStatsDesc[ 10 ],		//Range String
-					GunRange( pObject )/10,		//Modified Range
-					Weapon[ usItem ].usRange/10,	//Gun Range 
+					GunRange( pObject ),		//Modified Range
+					Weapon[ usItem ].usRange,	//Gun Range 
+					gWeaponStatsDesc[ 5 ],		//AP String
+					apStr,						//AP's
+					gWeaponStatsDesc[ 12 ],		//Weight String
+					fWeight,					//Weight
+					GetWeightUnitString()		//Weight units
+					);
+			}
+			break;
+
+		case IC_LAUNCHER:
+			{
+				//Calculate AP's
+				INT16 apStr[20];
+				INT16 apStr2[20];
+				UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject );
+
+				swprintf( (wchar_t *)apStr, L"%d", ubAttackAPs );
+
+				if (GetShotsPerBurst(pObject) > 0)
+				{
+					swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
+					wcscat( apStr, apStr2 );
+				}
+				else
+				{
+					wcscat( apStr, L" / -" );
+				}
+
+				if (GetAutofireShotsPerFiveAPs(pObject) > 0)
+				{
+					swprintf( (wchar_t *)apStr2, L" / %d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
+					wcscat( apStr, apStr2 );
+				}
+				else
+				{
+					wcscat( apStr, L" / -" );
+				}
+
+				//Info for weapons
+				swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s %s\n%s %1.1f %s", 
+					ItemNames[ usItem ], 
+					sValue, 
+					gWeaponStatsDesc[ 9 ],		//Accuracy String
+					Weapon[ usItem ].bAccuracy,
+					gWeaponStatsDesc[ 11 ],		//Damage String
+					GetDamage(pObject), 
+					gWeaponStatsDesc[ 10 ],		//Range String
+					GunRange( pObject ),		//Modified Range
+					Weapon[ usItem ].usRange,	//Gun Range 
 					gWeaponStatsDesc[ 5 ],		//AP String
 					apStr,						//AP's
 					gWeaponStatsDesc[ 12 ],		//Weight String