- extended item info on tool tip

- new strings for item info in English/German/Russian
- German translation updated
- screen shots are not overwritten anymore
- bug fix: climbing on roof with 'j' caused CTD
- reinforcements in Omerta allowed on insane difficulty



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@125 3b4a5df2-a311-0410-b5c6-a8a6f20db521

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.124" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.125" };
 
 
 #endif

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.124_2006_05_26.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.125_2006_05_26.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.124_2006_05_26.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.125_2006_05_26.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"

Standard Gaming Platform/video.cpp

@@ -1841,7 +1841,12 @@ void RefreshScreen(void *DummyVariable)
     // Ok now that temp surface has contents of backbuffer, copy temp surface to disk
     //
 
-    sprintf((char *) FileName, "SCREEN%03d.TGA", guiPrintFrameBufferIndex++); 
+	do
+	{
+		sprintf((char *) FileName, "SCREEN%03d.TGA", guiPrintFrameBufferIndex++);
+	}
+	while( (_access( (const char *)FileName, 0 )) != -1 );
+
     if ((OutputFile = fopen((const char *) FileName, "wb")) != NULL)
     {
       fprintf(OutputFile, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, LOBYTE(SCREEN_WIDTH), HIBYTE(SCREEN_WIDTH), LOBYTE(SCREEN_HEIGHT), HIBYTE(SCREEN_HEIGHT), 0x10, 0);

Strategic/Reinforcement.cpp

@@ -46,7 +46,7 @@ void GetNumberOfEnemiesInFiveSectors( INT16 sSectorX, INT16 sSectorY, UINT8 *pub
 	if( !gGameExternalOptions.gfAllowReinforcements )
 		return;
 
-	if ( GetTownIdForSector( sSectorX, sSectorY ) == OMERTA ) //Madd: skip Omerta
+	if ( ( GetTownIdForSector( sSectorX, sSectorY ) == OMERTA )&&( gGameOptions.ubDifficultyLevel != DIF_LEVEL_INSANE ) ) //Madd: skip Omerta //Lal: but not on insane ;-)
 		return;
 
 	GenerateDirectionInfos( sSectorX, sSectorY, &ubDirNumber, pusMoveDir, 
@@ -250,7 +250,7 @@ UINT8 DoReinforcementAsPendingEnemy( INT16 sMapX, INT16 sMapY )
 	if( !gGameExternalOptions.gfAllowReinforcements )
 		return 255;
 
-	if ( GetTownIdForSector( sMapX, sMapY ) == OMERTA ) //Madd: skip Omerta
+	if ( ( GetTownIdForSector( sMapX, sMapY ) == OMERTA )&&( gGameOptions.ubDifficultyLevel != DIF_LEVEL_INSANE ) ) //Madd: skip Omerta //Lal: but not on insane ;-)
 		return 255;
 
 	pThisSector = &SectorInfo[ SECTOR( sMapX, sMapY ) ];

Tactical/Interface Items.cpp

@@ -7249,12 +7249,15 @@ BOOLEAN AttemptToApplyCamo( SOLDIERTYPE *pSoldier, UINT16 usItemIndex )
 	return( FALSE );
 }
 
+
+
+
 void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldier )
 {
-	INT16									pStr[ 250 ]; 
-	UINT16								usItem = pObject->usItem;
-	INT32									cnt = 0;
-	INT32									iNumAttachments = 0;
+	INT16	pStr[ 250 ]; 
+	UINT16	usItem = pObject->usItem;
+	INT32	cnt = 0;
+	INT32	iNumAttachments = 0;
 
 	if( pSoldier != NULL )
 	{
@@ -7265,15 +7268,18 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 			return;
 		}
 	}
-	
+
+	//Money
 	if ( usItem == MONEY )
 	{	
 		swprintf( (wchar_t *)pStr, L"%ld", pObject->uiMoneyAmount );
 		InsertCommasForDollarFigure( pStr );
 		InsertDollarSignInToString( pStr );
 	}
+
+	// alternate money like silver or gold
 	else if ( Item[ usItem ].usItemClass == IC_MONEY )
-	{ // alternate money like silver or gold
+	{ 
 		INT16		pStr2[20];
 		swprintf( (wchar_t *)pStr2, L"%ld", pObject->uiMoneyAmount );
 		InsertCommasForDollarFigure( pStr2 );
@@ -7281,6 +7287,8 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 
 		swprintf( (wchar_t *)pStr, L"%s (%ls)", ItemNames[ usItem ], pStr2 );
 	}
+
+	//everything else
 	else if ( usItem != NOTHING )
 	{
 		// Retrieve the status of the items
@@ -7295,21 +7303,115 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 			}
 		}
 
-    if ( Item[ usItem ].usItemClass == IC_GUN && !Item[usItem].rocketlauncher && !Item[usItem].rocketrifle )
-    {
-        swprintf( (wchar_t *)pStr, L"%s (%s) [%d%%]", ItemNames[ usItem ], AmmoCaliber[ Weapon[ usItem ].ubCalibre ], sValue );
-    }
+		//get item weight
+		FLOAT fWeight = (float)(CalculateObjectWeight( pObject )) / 10;
+
+		if ( !gGameSettings.fOptions[ TOPTION_USE_METRIC_SYSTEM ] ) // metric units not enabled
+		{
+			fWeight = fWeight * 2.2f;
+		}
+
+		if ( fWeight < 0.1 )
+		{
+			fWeight = 0.1f;
+		}
+
+
+		//Calculate AP's
+		INT16 apStr[20];
+
+		if ( Item[ usItem ].usItemClass == IC_GUN && !Item[usItem].rocketlauncher && !Item[usItem].rocketrifle )
+		{
+			INT16 apStr2[20];
+			UINT8 ubAttackAPs = BaseAPsToShootOrStab( DEFAULT_APS, DEFAULT_AIMSKILL, pObject );
+
+			swprintf( (wchar_t *)apStr, L"%2d", ubAttackAPs );
+
+			if (GetShotsPerBurst(pObject) > 0)
+			{
+				swprintf( (wchar_t *)apStr2, L" / %2d", ubAttackAPs + CalcAPsToBurst( DEFAULT_APS, pObject ) );
+				wcscat( apStr, apStr2 );
+			}
+			else
+			{
+				wcscat( apStr, L" / -" );
+			}
+
+			if (GetAutofireShotsPerFiveAPs(pObject) > 0)
+			{
+				swprintf( (wchar_t *)apStr2, L" / %2d", ubAttackAPs + CalcAPsToAutofire( DEFAULT_APS, pObject, 3 ) );
+				wcscat( apStr, apStr2 );
+			}
+			else
+			{
+				wcscat( apStr, L" / -" );
+			}
+		}
+		else
+		{
+			swprintf( (wchar_t *)apStr, L"" );
+		}
+
+		//Info for weapons
+		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 ], 
+				AmmoCaliber[ Weapon[ usItem ].ubCalibre ], 
+				sValue, 
+				gWeaponStatsDesc[ 9 ],		//Accuracy String
+				Weapon[ usItem ].bAccuracy,
+				gWeaponStatsDesc[ 11 ],		//Damage String
+				GetDamage(pObject), 
+				gWeaponStatsDesc[ 10 ],		//Range String
+				Weapon[ usItem ].usRange,	//Gun Range 
+				GunRange( pObject ),		//Modified Range
+				gWeaponStatsDesc[ 5 ],		//AP String
+				apStr,						//AP's
+				gWeaponStatsDesc[ 12 ],		//Weight String
+				fWeight,					//Weight
+				GetWeightUnitString()		//Weight units
+				);
+		}
+
     // The next is for ammunition which gets the measurement 'rnds'
     else if (Item[ usItem ].usItemClass == IC_AMMO)
     {
         swprintf( (wchar_t *)pStr, L"%s [%d rnds]", ItemNames[ usItem ], pObject->ubShotsLeft[0] );
     }
-    // The final, and typical case, is that of an item with a percent status
-    else
-    {
-        swprintf( (wchar_t *)pStr, L"%s [%d%%]", ItemNames[ usItem ], sValue );
-    }
 
+		// explosives
+		else if ( (Item[ usItem ].usItemClass == IC_GRENADE)||(Item[ usItem ].usItemClass == IC_BOMB) )
+		{
+			UINT16 explDamage = (UINT16)( Explosive[Item[ usItem ].ubClassIndex].ubDamage + ( (double) Explosive[Item[ usItem ].ubClassIndex].ubDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier );
+			UINT16 explStunDamage = (UINT16)( Explosive[Item[ usItem ].ubClassIndex].ubStunDamage + ( (double) Explosive[Item[ usItem ].ubClassIndex].ubStunDamage / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier );
+
+			swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d\n%s %d\n%s %1.1f %s", 
+				ItemNames[ usItem ], 
+				sValue, 
+				gWeaponStatsDesc[ 11 ],		//Damage String
+				explDamage, 
+				gWeaponStatsDesc[ 13 ],		//Stun Damage String
+				explStunDamage,				//Stun Damage
+				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, 
+				gWeaponStatsDesc[ 12 ],		//Weight String
+				fWeight,					//Weight
+				GetWeightUnitString()		//Weight units
+				);
+		}
+
+		// Fingerprint ID (Soldier Name)
 		if ( ( Item[pObject->usItem].fingerprintid ) && pObject->ubImprintID < NO_PROFILE )
 		{
 			INT16		pStr2[20];
@@ -7326,13 +7428,13 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 
 				if ( iNumAttachments == 1 )
 				{
-					wcscat( pStr, L" ( " );
+					wcscat( pStr, L"\n[" );
 				}
 				else
 				{
-					wcscat( pStr, L", \n" );
+					wcscat( pStr, L", " );
 				}
-	
+
 				wcscat( pStr, ItemNames[ pObject->usAttachItem[ cnt ] ] );
 			}
 		}
@@ -7352,6 +7454,10 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 }
 
 
+
+
+
+
 UINT8 GetPrefferedItemSlotGraphicNum( UINT16 usItem )
 {
 	// Check for small item...

Tactical/Turn Based Input.cpp

@@ -2319,24 +2319,28 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 					}
 					else
 					{
-						BOOLEAN						fNearHeigherLevel;
-						BOOLEAN						fNearLowerLevel;
-						INT8							bDirection;
-						GetMercClimbDirection( gpSMCurrentMerc->ubID, &fNearLowerLevel, &fNearHeigherLevel );
+						if ( gpSMCurrentMerc != NULL )
+						{
+							BOOLEAN	fNearHeigherLevel;
+							BOOLEAN	fNearLowerLevel;
+							INT8	bDirection;
 
-						if ( fNearLowerLevel )
-						{
-							BeginSoldierClimbDownRoof( gpSMCurrentMerc );
-						}
-						if ( fNearHeigherLevel )
-						{
-							BeginSoldierClimbUpRoof( gpSMCurrentMerc );
-						}
+							GetMercClimbDirection( gpSMCurrentMerc->ubID, &fNearLowerLevel, &fNearHeigherLevel );
 
-						if ( FindFenceJumpDirection( gpSMCurrentMerc, gpSMCurrentMerc->sGridNo, gpSMCurrentMerc->bDirection, &bDirection ) )
-						{
-							BeginSoldierClimbFence( gpSMCurrentMerc );
-						}			
+							if ( fNearLowerLevel )
+							{
+								BeginSoldierClimbDownRoof( gpSMCurrentMerc );
+							}
+							if ( fNearHeigherLevel )
+							{
+								BeginSoldierClimbUpRoof( gpSMCurrentMerc );
+							}
+
+							if ( FindFenceJumpDirection( gpSMCurrentMerc, gpSMCurrentMerc->sGridNo, gpSMCurrentMerc->bDirection, &bDirection ) )
+							{
+								BeginSoldierClimbFence( gpSMCurrentMerc );
+							}
+						}
 					}
 					break;
 

Utils/_DutchText.cpp

@@ -117,26 +117,26 @@ UINT16 ShortItemNames[MAXITEMS][80] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 AmmoCaliber[][20] =
-{
-	L"0",
-	L".38 kal",
-	L"9mm",
-	L".45 kal",
-	L".357 kal",
-	L"12 gauge",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm NAVO",
-	L"7.62mm WP",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monster",
-	L"Raket",
-	L"", // dart
-	L"", // flame
-};
+UINT16 AmmoCaliber[MAXITEMS][20];// =
+//{
+//	L"0",
+//	L".38 kal",
+//	L"9mm",
+//	L".45 kal",
+//	L".357 kal",
+//	L"12 gauge",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm NAVO",
+//	L"7.62mm WP",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monster",
+//	L"Raket",
+//	L"", // dart
+//	L"", // flame
+//};
 
 // This BobbyRayAmmoCaliber is virtually the same as AmmoCaliber however the bobby version doesnt have as much room for the words.
 // 
@@ -145,25 +145,25 @@ UINT16 AmmoCaliber[][20] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 BobbyRayAmmoCaliber[][20] =
-{
-	L"0",
-	L".38 kal",
-	L"9mm",
-	L".45 kal",
-	L".357 kal",
-	L"12 gauge",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm N.",
-	L"7.62mm WP",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monster",
-	L"Raket",
-	L"", // dart
-};
+UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
+//{
+//	L"0",
+//	L".38 kal",
+//	L"9mm",
+//	L".45 kal",
+//	L".357 kal",
+//	L"12 gauge",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm N.",
+//	L"7.62mm WP",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monster",
+//	L"Raket",
+//	L"", // dart
+//};
 
 
 UINT16 WeaponType[][30] =
@@ -1073,6 +1073,12 @@ INT16		gWeaponStatsDesc[][ 14 ] =
 	L"",
 	L"=",
 	L"=",
+						//Lal: additional strings for tooltips
+	L"Accuracy:",	//9
+	L"Range:",		//10	
+	L"Damage:", 	//11
+	L"Weight:",		//12
+	L"Stun Damage:",//13
 };
 
 //The headers used for the merc's money.

Utils/_EnglishText.cpp

@@ -1064,13 +1064,21 @@ INT16		gWeaponStatsDesc[][ 14 ] =
 {
 	L"Weight (%s):", 
 	L"Status:",
-	L"Amount:", 		// Number of bullets left in a magazine
+	L"Amount:", 	// Number of bullets left in a magazine
 	L"Rng:",		// Range
 	L"Dam:",		// Damage
 	L"AP:",			// abbreviation for Action Points
 	L"",
 	L"=",
 	L"=",
+					//Lal: additional strings for tooltips
+	L"Accuracy:",	//9
+	L"Range:",		//10	
+	L"Damage:", 	//11
+	L"Weight:",		//12
+	L"Stun Damage:",//13
+
+
 };
 
 //The headers used for the merc's money.
@@ -1294,7 +1302,7 @@ UINT16 TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Mute",
 	L"Stance Up (|P|g|U|p)",
 	L"Cursor Level (|T|a|b)",
-	L"Climb / Jump",
+	L"Climb / |Jump",
 	L"Stance Down (|P|g|D|n)",
 	L"Examine (|C|t|r|l)",
 	L"Previous Merc",
@@ -3639,7 +3647,7 @@ STR16 pMessageStrings[] =
 	L"No room to pass %s to %s.", //pass "item" to "merc".  Same instructions as above.
 
 	//A list of attachments appear after the items.  Ex:  Kevlar vest ( Ceramic Plate 'Attached )'
-	L" Attached )",
+	L" Attached]",
 
 	//Cheat modes
 	L"Cheat level ONE reached",

Utils/_FrenchText.cpp

@@ -122,26 +122,26 @@ UINT16 ShortItemNames[MAXITEMS][80] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 AmmoCaliber[][20] =
-{
-	L"0",
-	L"cal .38",
-	L"9mm",
-	L"cal .45",
-	L"cal .357",
-	L"cal 12",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm OTAN",
-	L"7.62mm PV",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monster",
-	L"Roquette",
-	L"", // dart
-	L"", // flame
-};
+UINT16 AmmoCaliber[MAXITEMS][20];// =
+//{
+//	L"0",
+//	L"cal .38",
+//	L"9mm",
+//	L"cal .45",
+//	L"cal .357",
+//	L"cal 12",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm OTAN",
+//	L"7.62mm PV",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monster",
+//	L"Roquette",
+//	L"", // dart
+//	L"", // flame
+//};
 
 // This BobbyRayAmmoCaliber is virtually the same as AmmoCaliber however the bobby version doesnt have as much room for the words.
 // 
@@ -150,25 +150,25 @@ UINT16 AmmoCaliber[][20] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 BobbyRayAmmoCaliber[][20] =
-{
-	L"0",
-	L"cal .38",
-	L"9mm",
-	L"cal .45",
-	L"cal .357",
-	L"cal 12",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm O.",
-	L"7.62mm PV",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monster",
-	L"Roquette",
-	L"", // dart
-};
+UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
+//{
+//	L"0",
+//	L"cal .38",
+//	L"9mm",
+//	L"cal .45",
+//	L"cal .357",
+//	L"cal 12",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm O.",
+//	L"7.62mm PV",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monster",
+//	L"Roquette",
+//	L"", // dart
+//};
 
 
 UINT16 WeaponType[][30] =
@@ -1063,6 +1063,12 @@ INT16		gWeaponStatsDesc[][ 14 ] =
 	L"",
 	L"=",
 	L"=",
+						//Lal: additional strings for tooltips
+	L"Accuracy:",	//9
+	L"Range:",		//10	
+	L"Damage:", 	//11
+	L"Weight:",		//12
+	L"Stun Damage:",//13
 };
 
 //The headers used for the merc's money.

Utils/_GermanText.cpp

@@ -122,26 +122,26 @@ UINT16 ShortItemNames[MAXITEMS][80] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 AmmoCaliber[][20] =
-{
-	L"0",
-	L".38 Kal",
-	L"9mm",
-	L".45 Kal",
-	L".357 Kal",
-	L"12 Kal",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm NATO",
-	L"7.62mm WP",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monster",
-	L"Rakete",
-	L"",
-	L"",
-};
+UINT16 AmmoCaliber[MAXITEMS][20];// =
+//{
+//	L"0",
+//	L".38 Kal",
+//	L"9mm",
+//	L".45 Kal",
+//	L".357 Kal",
+//	L"12 Kal",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm NATO",
+//	L"7.62mm WP",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monster",
+//	L"Rakete",
+//	L"",
+//	L"",
+//};
 
 // This BobbyRayAmmoCaliber is virtually the same as AmmoCaliber however the bobby version doesnt have as much room for the words.
 // 
@@ -150,25 +150,25 @@ UINT16 AmmoCaliber[][20] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 BobbyRayAmmoCaliber[][20] =
-{
-	L"0",
-	L".38 Kal",
-	L"9mm",
-	L".45 Kal",
-	L".357 Kal",
-	L"12 Kal",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm N.",
-	L"7.62mm WP",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monster",
-	L"Rakete",
-	L"", // dart
-};
+UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
+//{
+//	L"0",
+//	L".38 Kal",
+//	L"9mm",
+//	L".45 Kal",
+//	L".357 Kal",
+//	L"12 Kal",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm N.",
+//	L"7.62mm WP",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monster",
+//	L"Rakete",
+//	L"", // dart
+//};
 
 UINT16 WeaponType[][30] =
 {
@@ -1038,6 +1038,12 @@ INT16		gWeaponStatsDesc[][ 14 ] = //USED TO BE 13
 	L"",
 	L"=",
 	L"=",
+						//Lal: additional strings for tooltips
+	L"Genauigkeit:",	//9
+	L"Reichweite:",		//10	
+	L"Schaden:", 		//11
+	L"Gewicht:",		//12
+	L"Bet. Schaden:",	//13
 };
 
 //The headers used for the merc's money.

Utils/_ItalianText.cpp

@@ -115,26 +115,26 @@ UINT16 ShortItemNames[MAXITEMS][80] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 AmmoCaliber[][20] =
-{
-	L"0",
-	L"cal .38",
-	L"9 mm",
-	L"cal .45",
-	L"cal .357",
-	L"cal fisso 12",
-	L"CAW",
-	L"5.45 mm",
-	L"5.56 mm",
-	L"7.62 mm NATO",
-	L"7.62 mm WP",
-	L"4.7 mm",
-	L"5.7 mm",
-	L"Mostro",
-	L"Missile",
-	L"", // dart
-	L"", // flame
-};
+UINT16 AmmoCaliber[MAXITEMS][20];// =
+//{
+//	L"0",
+//	L"cal .38",
+//	L"9 mm",
+//	L"cal .45",
+//	L"cal .357",
+//	L"cal fisso 12",
+//	L"CAW",
+//	L"5.45 mm",
+//	L"5.56 mm",
+//	L"7.62 mm NATO",
+//	L"7.62 mm WP",
+//	L"4.7 mm",
+//	L"5.7 mm",
+//	L"Mostro",
+//	L"Missile",
+//	L"", // dart
+//	L"", // flame
+//};
 
 // This BobbyRayAmmoCaliber is virtually the same as AmmoCaliber however the bobby version doesnt have as much room for the words.
 // 
@@ -143,25 +143,25 @@ UINT16 AmmoCaliber[][20] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 BobbyRayAmmoCaliber[][20] =
-{
-	L"0",
-	L"cal .38",
-	L"9 mm",
-	L"cal .45",
-	L"cal .357",
-	L"cal fisso 12",
-	L"CAWS",
-	L"5.45 mm",
-	L"5.56 mm",
-	L"7.62 mm N.",
-	L"7.62 mm WP",
-	L"4.7 mm",
-	L"5.7 mm",
-	L"Mostro",
-	L"Missile",
-	L"", // dart
-};
+UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
+//{
+//	L"0",
+//	L"cal .38",
+//	L"9 mm",
+//	L"cal .45",
+//	L"cal .357",
+//	L"cal fisso 12",
+//	L"CAWS",
+//	L"5.45 mm",
+//	L"5.56 mm",
+//	L"7.62 mm N.",
+//	L"7.62 mm WP",
+//	L"4.7 mm",
+//	L"5.7 mm",
+//	L"Mostro",
+//	L"Missile",
+//	L"", // dart
+//};
 
 
 UINT16 WeaponType[][30] =
@@ -1056,6 +1056,12 @@ INT16		gWeaponStatsDesc[][ 14 ] =
 	L"",
 	L"=",
 	L"=",
+						//Lal: additional strings for tooltips
+	L"Accuracy:",	//9
+	L"Range:",		//10	
+	L"Damage:", 	//11
+	L"Weight:",		//12
+	L"Stun Damage:",//13
 };
 
 //The headers used for the merc's money.

Utils/_Ja25GermanText.cpp

@@ -58,7 +58,7 @@ STR16 gzIMPSkillTraitsText[]=
 	L"Getarnt",
 	L"Kampfsport",
 
-	L"Nichts",
+	L"Keine",
 	L"B.S.E. Spezialitäten",
 };
 

Utils/_PolishText.cpp

@@ -116,26 +116,26 @@ UINT16 ShortItemNames[MAXITEMS][80] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 AmmoCaliber[][20] =
-{
-	L"0",
-	L".38 cal",
-	L"9mm",
-	L".45 cal",
-	L".357 cal",
-	L"12 gauge",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm NATO",
-	L"7.62mm WP",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monstrum",
-	L"Rakiety",
-	L"", // dart
-	L"", // flame
-};
+UINT16 AmmoCaliber[MAXITEMS][20];// =
+//{
+//	L"0",
+//	L".38 cal",
+//	L"9mm",
+//	L".45 cal",
+//	L".357 cal",
+//	L"12 gauge",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm NATO",
+//	L"7.62mm WP",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monstrum",
+//	L"Rakiety",
+//	L"", // dart
+//	L"", // flame
+//};
 
 // This BobbyRayAmmoCaliber is virtually the same as AmmoCaliber however the bobby version doesnt have as much room for the words.
 // 
@@ -144,25 +144,25 @@ UINT16 AmmoCaliber[][20] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 BobbyRayAmmoCaliber[][20] =
-{
-	L"0",
-	L".38 cal",
-	L"9mm",
-	L".45 cal",
-	L".357 cal",
-	L"12 gauge",
-	L"CAWS",
-	L"5.45mm",
-	L"5.56mm",
-	L"7.62mm N.",
-	L"7.62mm WP",
-	L"4.7mm",
-	L"5.7mm",
-	L"Monstrum",
-	L"Rakiety",
-	L"", // dart
-};
+UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
+//{
+//	L"0",
+//	L".38 cal",
+//	L"9mm",
+//	L".45 cal",
+//	L".357 cal",
+//	L"12 gauge",
+//	L"CAWS",
+//	L"5.45mm",
+//	L"5.56mm",
+//	L"7.62mm N.",
+//	L"7.62mm WP",
+//	L"4.7mm",
+//	L"5.7mm",
+//	L"Monstrum",
+//	L"Rakiety",
+//	L"", // dart
+//};
 
 
 UINT16 WeaponType[][30] =
@@ -1057,6 +1057,12 @@ INT16		gWeaponStatsDesc[][ 14 ] =
 	L"",
 	L"=",
 	L"=",
+						//Lal: additional strings for tooltips
+	L"Accuracy:",	//9
+	L"Range:",		//10	
+	L"Damage:", 	//11
+	L"Weight:",		//12
+	L"Stun Damage:",//13
 };
 
 //The headers used for the merc's money.

Utils/_RussianText.cpp

@@ -115,28 +115,28 @@ UINT16 ShortItemNames[MAXITEMS][80] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 AmmoCaliber[][20] =
-{
-	L"0",
-	L",38 кал",
-	L"9мм",
-	L",45 кал",
-	L",357 кал",
-	L"12 кал",
-	L"ОББ",
-	L"5,45мм",
-	L"5,56мм",
-	L"7,62мм НАТО",
-	L"7,62мм ВД",
-	L"4,7мм",
-	L"5,7мм",
-	L"Монстр",
-	L"Ракета",
-	L"", // дротик
-	L"", // пламя
-//	L".50 cal", // barrett
-//	L"9mm Hvy", // Val silent
-};
+UINT16 AmmoCaliber[MAXITEMS][20];// =
+//{
+//	L"0",
+//	L",38 êàë",
+//	L"9ìì",
+//	L",45 êàë",
+//	L",357 êàë",
+//	L"12 êàë",
+//	L"ÎÁÁ",
+//	L"5,45ìì",
+//	L"5,56ìì",
+//	L"7,62ìì ÍÀÒÎ",
+//	L"7,62ìì ÂÄ",
+//	L"4,7ìì",
+//	L"5,7ìì",
+//	L"Ìîíñòð",
+//	L"Ðàêåòà",
+//	L"", // äðîòèê
+//	L"", // ïëàìÿ
+////	L".50 cal", // barrett
+////	L"9mm Hvy", // Val silent
+//};
 
 // This BobbyRayAmmoCaliber is virtually the same as AmmoCaliber however the bobby version doesnt have as much room for the words.
 // 
@@ -145,28 +145,28 @@ UINT16 AmmoCaliber[][20] =
 // NATO is the North Atlantic Treaty Organization
 // WP is Warsaw Pact
 // cal is an abbreviation for calibre
-UINT16 BobbyRayAmmoCaliber[][20] =
-{
-	L"0",
-	L",38 кал",
-	L"9мм",
-	L",45 кал",
-	L",357 кал",
-	L"12 кал",
-	L"ОББ",
-	L"5,45мм",
-	L"5,56мм",
-	L"7,62мм Н.",
-	L"7,62мм ВД",
-	L"4,7мм",
-	L"5.7мм",
-	L"Монстр",
-	L"Ракета",
-	L"", // дротик
-//	L"", // flamethrower
-//	L".50 cal", // barrett
-//	L"9mm Hvy", // Val silent
-};
+UINT16 BobbyRayAmmoCaliber[MAXITEMS][20] ;//=
+//{
+//	L"0",
+//	L",38 êàë",
+//	L"9ìì",
+//	L",45 êàë",
+//	L",357 êàë",
+//	L"12 êàë",
+//	L"ÎÁÁ",
+//	L"5,45ìì",
+//	L"5,56ìì",
+//	L"7,62ìì Í.",
+//	L"7,62ìì ÂÄ",
+//	L"4,7ìì",
+//	L"5.7ìì",
+//	L"Ìîíñòð",
+//	L"Ðàêåòà",
+//	L"", // äðîòèê
+////	L"", // flamethrower
+////	L".50 cal", // barrett
+////	L"9mm Hvy", // Val silent
+//};
 
 
 UINT16 WeaponType[][30] =
@@ -1064,6 +1064,12 @@ INT16		gWeaponStatsDesc[][ 14 ] =
 	L"",
 	L"=",
 	L"=",
+						//Lal: additional strings for tooltips
+	L"Òî÷íîñòü:",	//9
+	L"Äèñò:",		//10	
+	L"Óðîí:", 	//11
+	L"Âåñ:",		//12
+	L"Stun Óðîí:",//13
 };
 
 //The headers used for the merc's money.