Bugfix: EDB Fix by Headrock

- Show Burst AND Auto penalty instead of only ONE (usually Burst penalty) 

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

Tactical/Interface Enhanced.cpp

@@ -155,6 +155,8 @@ INT16		BULLET_AMMOTOHITBON_X;
 INT16		BULLET_AMMOTOHITBON_Y;
 INT16		BULLET_AMMOBURSTBON_X;
 INT16		BULLET_AMMOBURSTBON_Y;
+INT16		BULLET_AMMOAUTOBON_X;
+INT16		BULLET_AMMOAUTOBON_Y;
 INT16		BULLET_AMMORELIABILITYBON_X;
 INT16		BULLET_AMMORELIABILITYBON_Y;
 INT16		BULLET_AMMONOISESUPP_X;
@@ -383,7 +385,7 @@ void InitEDBCoords()
 		gAmmoDescStatsRects[11].iLeft = 173;	gAmmoDescStatsRects[11].iTop = 265;	gAmmoDescStatsRects[11].iRight = 230;	gAmmoDescStatsRects[11].iBottom = 276;
 		gAmmoDescStatsRects[12].iLeft = 173;	gAmmoDescStatsRects[12].iTop = 277;	gAmmoDescStatsRects[12].iRight = 230;	gAmmoDescStatsRects[12].iBottom = 288;	// Fourth Column
 		gAmmoDescStatsRects[13].iLeft = 173;	gAmmoDescStatsRects[13].iTop = 289;	gAmmoDescStatsRects[13].iRight = 230;	gAmmoDescStatsRects[13].iBottom = 300;
-		gAmmoDescStatsRects[14].iLeft = 0;		gAmmoDescStatsRects[14].iTop = 0;	gAmmoDescStatsRects[14].iRight = 1;		gAmmoDescStatsRects[14].iBottom = 1;	// Placeholders
+		gAmmoDescStatsRects[14].iLeft = 173;	gAmmoDescStatsRects[14].iTop = 301;	gAmmoDescStatsRects[14].iRight = 230;	gAmmoDescStatsRects[14].iBottom = 312;	// Placeholders
 		gAmmoDescStatsRects[15].iLeft = 0;		gAmmoDescStatsRects[15].iTop = 0;	gAmmoDescStatsRects[15].iRight = 1;		gAmmoDescStatsRects[15].iBottom = 1;
 		gAmmoDescStatsRects[16].iLeft = 0;		gAmmoDescStatsRects[16].iTop = 0;	gAmmoDescStatsRects[16].iRight = 1;		gAmmoDescStatsRects[16].iBottom = 1;
 		gAmmoDescStatsRects[17].iLeft = 0;		gAmmoDescStatsRects[17].iTop = 0;	gAmmoDescStatsRects[17].iRight = 1;		gAmmoDescStatsRects[17].iBottom = 1;
@@ -519,12 +521,12 @@ void InitEDBCoords()
 			gAmmoDescStatsRects[6].iLeft = 296;		gAmmoDescStatsRects[6].iTop = 66;	gAmmoDescStatsRects[6].iRight = 321;	gAmmoDescStatsRects[6].iBottom = 89;
 			gAmmoDescStatsRects[7].iLeft = 269;		gAmmoDescStatsRects[7].iTop = 90;	gAmmoDescStatsRects[7].iRight = 291;	gAmmoDescStatsRects[7].iBottom = 113;
 			gAmmoDescStatsRects[8].iLeft = 202;		gAmmoDescStatsRects[8].iTop = 134;	gAmmoDescStatsRects[8].iRight = 260;	gAmmoDescStatsRects[8].iBottom = 145;	// Third Column
-			gAmmoDescStatsRects[9].iLeft = 202;		gAmmoDescStatsRects[9].iTop = 146;	gAmmoDescStatsRects[9].iRight = 260;	gAmmoDescStatsRects[9].iBottom = 157;
-			gAmmoDescStatsRects[10].iLeft = 202;	gAmmoDescStatsRects[10].iTop = 158;	gAmmoDescStatsRects[10].iRight = 260;	gAmmoDescStatsRects[10].iBottom = 169;
-			gAmmoDescStatsRects[11].iLeft = 202;	gAmmoDescStatsRects[11].iTop = 170;	gAmmoDescStatsRects[11].iRight = 260;	gAmmoDescStatsRects[11].iBottom = 181;
-			gAmmoDescStatsRects[12].iLeft = 267;	gAmmoDescStatsRects[12].iTop = 134;	gAmmoDescStatsRects[12].iRight = 325;	gAmmoDescStatsRects[12].iBottom = 145;	// Fourth Column
-			gAmmoDescStatsRects[13].iLeft = 267;	gAmmoDescStatsRects[13].iTop = 146;	gAmmoDescStatsRects[13].iRight = 325;	gAmmoDescStatsRects[13].iBottom = 1;
-			gAmmoDescStatsRects[14].iLeft = 0;		gAmmoDescStatsRects[14].iTop = 0;	gAmmoDescStatsRects[14].iRight = 1;		gAmmoDescStatsRects[14].iBottom = 1;	// Placeholders
+			gAmmoDescStatsRects[9].iLeft = 202;		gAmmoDescStatsRects[9].iTop = 158;	gAmmoDescStatsRects[9].iRight = 260;	gAmmoDescStatsRects[9].iBottom = 169;
+			gAmmoDescStatsRects[10].iLeft = 267;	gAmmoDescStatsRects[10].iTop = 134;	gAmmoDescStatsRects[10].iRight = 325;	gAmmoDescStatsRects[10].iBottom = 145;
+			gAmmoDescStatsRects[11].iLeft = 267;	gAmmoDescStatsRects[11].iTop = 146;	gAmmoDescStatsRects[11].iRight = 325;	gAmmoDescStatsRects[11].iBottom = 157;
+			gAmmoDescStatsRects[12].iLeft = 267;	gAmmoDescStatsRects[12].iTop = 158;	gAmmoDescStatsRects[12].iRight = 325;	gAmmoDescStatsRects[12].iBottom = 169;	// Fourth Column
+			gAmmoDescStatsRects[13].iLeft = 202;	gAmmoDescStatsRects[13].iTop = 170;	gAmmoDescStatsRects[13].iRight = 260;	gAmmoDescStatsRects[13].iBottom = 181;
+			gAmmoDescStatsRects[14].iLeft = 267;	gAmmoDescStatsRects[14].iTop = 170;	gAmmoDescStatsRects[14].iRight = 325;	gAmmoDescStatsRects[14].iBottom = 181;	// Placeholders
 			gAmmoDescStatsRects[15].iLeft = 0;		gAmmoDescStatsRects[15].iTop = 0;	gAmmoDescStatsRects[15].iRight = 1;		gAmmoDescStatsRects[15].iBottom = 1;
 			gAmmoDescStatsRects[16].iLeft = 0;		gAmmoDescStatsRects[16].iTop = 0;	gAmmoDescStatsRects[16].iRight = 1;		gAmmoDescStatsRects[16].iBottom = 1;
 			gAmmoDescStatsRects[17].iLeft = 0;		gAmmoDescStatsRects[17].iTop = 0;	gAmmoDescStatsRects[17].iRight = 1;		gAmmoDescStatsRects[17].iBottom = 1;
@@ -662,8 +664,8 @@ void InitEDBCoords()
 			gAmmoDescStatsRects[10].iLeft = 407;	gAmmoDescStatsRects[10].iTop = 36;	gAmmoDescStatsRects[10].iRight = 465;	gAmmoDescStatsRects[10].iBottom = 47;
 			gAmmoDescStatsRects[11].iLeft = 407;	gAmmoDescStatsRects[11].iTop = 48;	gAmmoDescStatsRects[11].iRight = 465;	gAmmoDescStatsRects[11].iBottom = 59;
 			gAmmoDescStatsRects[12].iLeft = 407;	gAmmoDescStatsRects[12].iTop = 60;	gAmmoDescStatsRects[12].iRight = 465;	gAmmoDescStatsRects[12].iBottom = 71;
-			gAmmoDescStatsRects[13].iLeft = 407;	gAmmoDescStatsRects[13].iTop = 72;	gAmmoDescStatsRects[13].iRight = 465;	gAmmoDescStatsRects[13].iBottom = 1;
-			gAmmoDescStatsRects[14].iLeft = 0;		gAmmoDescStatsRects[14].iTop = 0;	gAmmoDescStatsRects[14].iRight = 1;		gAmmoDescStatsRects[14].iBottom = 1;	// Placeholders
+			gAmmoDescStatsRects[13].iLeft = 407;	gAmmoDescStatsRects[13].iTop = 72;	gAmmoDescStatsRects[13].iRight = 465;	gAmmoDescStatsRects[13].iBottom = 83;
+			gAmmoDescStatsRects[14].iLeft = 407;	gAmmoDescStatsRects[14].iTop = 84;	gAmmoDescStatsRects[14].iRight = 465;	gAmmoDescStatsRects[14].iBottom = 95;	// Placeholders
 			gAmmoDescStatsRects[15].iLeft = 0;		gAmmoDescStatsRects[15].iTop = 0;	gAmmoDescStatsRects[15].iRight = 1;		gAmmoDescStatsRects[15].iBottom = 1;
 			gAmmoDescStatsRects[16].iLeft = 0;		gAmmoDescStatsRects[16].iTop = 0;	gAmmoDescStatsRects[16].iRight = 1;		gAmmoDescStatsRects[16].iBottom = 1;
 			gAmmoDescStatsRects[17].iLeft = 0;		gAmmoDescStatsRects[17].iTop = 0;	gAmmoDescStatsRects[17].iRight = 1;		gAmmoDescStatsRects[17].iBottom = 1;
@@ -854,8 +856,8 @@ void InitDescStatCoords()
 				gWeaponStats[18].sX = 268;	gWeaponStats[18].sY = 136;	gWeaponStats[18].sValDx = 30;	// 18) COL 4; ROW 1
 				gWeaponStats[19].sX = 268;	gWeaponStats[19].sY = 148;	gWeaponStats[19].sValDx = 30;	// 19) COL 4; ROW 2
 				gWeaponStats[20].sX = 268;	gWeaponStats[20].sY = 160;	gWeaponStats[20].sValDx = 30;	// 20) COL 4; ROW 3
-				gWeaponStats[21].sX = 268;	gWeaponStats[21].sY = 172;	gWeaponStats[21].sValDx = 30;	// 21) COL 4; ROW 4
-				gWeaponStats[22].sX = 203;	gWeaponStats[22].sY = 172;	gWeaponStats[22].sValDx = 30;	// 22) COL 3; ROW 4
+				gWeaponStats[21].sX = 203;	gWeaponStats[21].sY = 172;	gWeaponStats[21].sValDx = 30;	// 21) COL 3; ROW 4
+				gWeaponStats[22].sX = 268;	gWeaponStats[22].sY = 172;	gWeaponStats[22].sValDx = 30;	// 22) COL 4; ROW 4
 				// EQUALS signs
 				gWeaponStats[23].sX = 235;	gWeaponStats[23].sY = 44;	gWeaponStats[23].sValDx = 0;	// 23) COL 1; ROW 1
 				gWeaponStats[24].sX = 235;	gWeaponStats[24].sY = 56;	gWeaponStats[24].sValDx = 0;	// 24) COL 1; ROW 2
@@ -876,8 +878,8 @@ void InitDescStatCoords()
 				gWeaponStats[39].sX = 300;	gWeaponStats[39].sY = 136;	gWeaponStats[39].sValDx = 0;	// 39) COL 4; ROW 1
 				gWeaponStats[40].sX = 300;	gWeaponStats[40].sY = 148;	gWeaponStats[40].sValDx = 0;	// 40) COL 4; ROW 2
 				gWeaponStats[41].sX = 300;	gWeaponStats[41].sY = 160;	gWeaponStats[41].sValDx = 0;	// 41) COL 4; ROW 3
-				gWeaponStats[42].sX = 300;	gWeaponStats[42].sY = 172;	gWeaponStats[42].sValDx = 0;	// 42) COL 4; ROW 4
-				gWeaponStats[43].sX = 235;	gWeaponStats[43].sY = 172;	gWeaponStats[43].sValDx = 0;	// 43) COL 3; ROW 4
+				gWeaponStats[42].sX = 235;	gWeaponStats[42].sY = 172;	gWeaponStats[42].sValDx = 0;	// 42) COL 3; ROW 4
+				gWeaponStats[43].sX = 300;	gWeaponStats[43].sY = 172;	gWeaponStats[43].sValDx = 0;	// 43) COL 4; ROW 4
 				// Nonregular locations for explosive radius values (COL 2; ROW 3)
 				gWeaponStats[44].sX = 273;	gWeaponStats[44].sY = 68;	gWeaponStats[44].sValDx = 0;	// 44) COL 2; ROW 3; LOC 1 - Starting Radius
 				gWeaponStats[45].sX = 291;	gWeaponStats[45].sY = 68;	gWeaponStats[45].sValDx = 0;	// 45) COL 2; ROW 3; LOC 2 - Single Radius
@@ -1369,12 +1371,14 @@ void InitItemDescriptionBoxOffsets()
 			BULLET_AMMODAMAGEBON_Y		= (136 + gsInvDescY);
 			BULLET_AMMOTOHITBON_X		= (174 + gsInvDescX);
 			BULLET_AMMOTOHITBON_Y		= (148 + gsInvDescY);
+			BULLET_AMMOAUTOBON_X		= (174 + gsInvDescX);
+			BULLET_AMMOAUTOBON_Y		= (160 + gsInvDescY);
 			BULLET_AMMOBURSTBON_X		= (174 + gsInvDescX);
-			BULLET_AMMOBURSTBON_Y		= (160 + gsInvDescY);
+			BULLET_AMMOBURSTBON_Y		= (172 + gsInvDescY);
 			BULLET_AMMORELIABILITYBON_X		= (174 + gsInvDescX);
-			BULLET_AMMORELIABILITYBON_Y		= (172 + gsInvDescY);
+			BULLET_AMMORELIABILITYBON_Y		= (184 + gsInvDescY);
 			BULLET_AMMONOISESUPP_X		= (174 + gsInvDescX);
-			BULLET_AMMONOISESUPP_Y		= (184 + gsInvDescY);
+			BULLET_AMMONOISESUPP_Y		= (196 + gsInvDescY);
 
 			// Icon Locations for EXPLOSIVES stats
 			BULLET_EXPLOSIVEDAMAGE_X	= (47 + gsInvDescX);
@@ -1574,15 +1578,17 @@ void InitItemDescriptionBoxOffsets()
 			BULLET_AMMORANGEBON_X	=	(203 + gsInvDescX);
 			BULLET_AMMORANGEBON_Y	=	(136 + gsInvDescY);
 			BULLET_AMMODAMAGEBON_X	=	(203 + gsInvDescX);
-			BULLET_AMMODAMAGEBON_Y	=	(148 + gsInvDescY);
-			BULLET_AMMOTOHITBON_X	=	(203 + gsInvDescX);
-			BULLET_AMMOTOHITBON_Y	=	(160 + gsInvDescY);
-			BULLET_AMMOBURSTBON_X	=	(203 + gsInvDescX);
-			BULLET_AMMOBURSTBON_Y	=	(172 + gsInvDescY);
-			BULLET_AMMORELIABILITYBON_X	=	(268 + gsInvDescX);
-			BULLET_AMMORELIABILITYBON_Y	=	(136 + gsInvDescY);
+			BULLET_AMMODAMAGEBON_Y	=	(160 + gsInvDescY);
+			BULLET_AMMOTOHITBON_X	=	(268 + gsInvDescX);
+			BULLET_AMMOTOHITBON_Y	=	(136 + gsInvDescY);
+			BULLET_AMMORELIABILITYBON_X	=	(203 + gsInvDescX);
+			BULLET_AMMORELIABILITYBON_Y	=	(172 + gsInvDescY);
+			BULLET_AMMOAUTOBON_X	=	(268 + gsInvDescX);
+			BULLET_AMMOAUTOBON_Y	=	(148 + gsInvDescY);
+			BULLET_AMMOBURSTBON_X	=	(268 + gsInvDescX);
+			BULLET_AMMOBURSTBON_Y	=	(160 + gsInvDescY);
 			BULLET_AMMONOISESUPP_X	=	(268 + gsInvDescX);
-			BULLET_AMMONOISESUPP_Y	=	(148 + gsInvDescY);
+			BULLET_AMMONOISESUPP_Y	=	(172 + gsInvDescY);
 
 			// Icon Locations for EXPLOSIVES stats
 			BULLET_EXPLOSIVEDAMAGE_X	=	(203 + gsInvDescX);
@@ -1750,12 +1756,14 @@ void InitItemDescriptionBoxOffsets()
 			BULLET_AMMODAMAGEBON_Y	=	(26 + gsInvDescY);
 			BULLET_AMMOTOHITBON_X	=	(408 + gsInvDescX);
 			BULLET_AMMOTOHITBON_Y	=	(38 + gsInvDescY);
+			BULLET_AMMOAUTOBON_X	=	(408 + gsInvDescX);
+			BULLET_AMMOAUTOBON_Y	=	(50 + gsInvDescY);
 			BULLET_AMMOBURSTBON_X	=	(408 + gsInvDescX);
-			BULLET_AMMOBURSTBON_Y	=	(50 + gsInvDescY);
+			BULLET_AMMOBURSTBON_Y	=	(62 + gsInvDescY);
 			BULLET_AMMORELIABILITYBON_X	=	(408 + gsInvDescX);
-			BULLET_AMMORELIABILITYBON_Y	=	(62 + gsInvDescY);
+			BULLET_AMMORELIABILITYBON_Y	=	(74 + gsInvDescY);
 			BULLET_AMMONOISESUPP_X	=	(408 + gsInvDescX);
-			BULLET_AMMONOISESUPP_Y	=	(74 + gsInvDescY);
+			BULLET_AMMONOISESUPP_Y	=	(86 + gsInvDescY);
 
 			// Icon Locations for EXPLOSIVES stats
 			BULLET_EXPLOSIVEDAMAGE_X	=	(274 + gsInvDescX);
@@ -2099,16 +2107,27 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
 			// Non-Launcher Guns Only
 			if ( Item[ gpItemDescObject->usItem ].usItemClass == IC_GUN && !Item[ gpItemDescObject->usItem].rocketlauncher )
 			{
-				if (GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 || GetShotsPerBurst(gpItemDescObject)> 0 )
+				if ( GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 || GetShotsPerBurst(gpItemDescObject) > 0 )
 				{
-					// BURST PENALTY
+					// AUTO/BURST PENALTY TOOLTIP activated
 					MSYS_EnableRegion( &gStatsFasthelpRegions[ 2 ] );
 
-					if ( Weapon[ gpItemDescObject->usItem ].bAutofireShotsPerFiveAP > 0 )
+					if ( GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 && GetShotsPerBurst(gpItemDescObject) <= 0 )
 					{
-						// AUTOFIRE SHOTS PER 5 AP
-						MSYS_EnableRegion( &gStatsFasthelpRegions[ 3 ] );
+						// Change help text to "Autofire Penalty" (no burst)
+						SetRegionFastHelpText( &(gStatsFasthelpRegions[ 2 ]), gzWeaponStatsFasthelp[ 27 ] );
 					}
+					if ( GetShotsPerBurst(gpItemDescObject) > 0 && GetAutofireShotsPerFiveAPs(gpItemDescObject) <= 0 )
+					{
+						// Change help text to "Burst Penalty" (no autofire)
+						SetRegionFastHelpText( &(gStatsFasthelpRegions[ 2 ]), gzWeaponStatsFasthelp[ 28 ] );
+					}
+				}
+
+				if ( GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 )
+				{
+					// AUTOFIRE SHOTS PER 5 AP
+					MSYS_EnableRegion( &gStatsFasthelpRegions[ 3 ] );
 				}
 			}
 				
@@ -2237,22 +2256,28 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
 				MSYS_EnableRegion( &gStatsFasthelpRegions[ 10 ] );
 			}
 
-			// BURST BONUS
-			if ( Item[ gpItemDescObject->usItem ].bursttohitbonus != 0 || Item[ gpItemDescObject->usItem ].autofiretohitbonus != 0 )
+			// AUTO BONUS
+			if ( Item[ gpItemDescObject->usItem ].autofiretohitbonus != 0 )
 			{
 				MSYS_EnableRegion( &gStatsFasthelpRegions[ 11 ] );
 			}
 
+			// BURST BONUS
+			if ( Item[ gpItemDescObject->usItem ].bursttohitbonus != 0 )
+			{
+				MSYS_EnableRegion( &gStatsFasthelpRegions[ 12 ] );
+			}
+
 			// RELIABILITY BONUS
 			if ( Item[ gpItemDescObject->usItem ].bReliability != 0 )
 			{
-				MSYS_EnableRegion( &gStatsFasthelpRegions[ 12 ] );
+				MSYS_EnableRegion( &gStatsFasthelpRegions[ 13 ] );
 			}
 
 			// NOISE SUPPRESSION
 			if ( Item[ gpItemDescObject->usItem ].percentnoisereduction > 0 )
 			{
-				MSYS_EnableRegion( &gStatsFasthelpRegions[ 13 ] );
+				MSYS_EnableRegion( &gStatsFasthelpRegions[ 14 ] );
 			}
 		}
 
@@ -2873,16 +2898,27 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
 			// Non-Launcher Guns Only
 			if ( Item[ gpItemDescObject->usItem ].usItemClass == IC_GUN && !Item[ gpItemDescObject->usItem].rocketlauncher )
 			{
-				if (GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 || GetShotsPerBurst(gpItemDescObject)> 0 )
+				if ( GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 || GetShotsPerBurst(gpItemDescObject) > 0 )
 				{
-					// BURST PENALTY
+					// AUTO/BURST PENALTY TOOLTIP activated
 					MSYS_EnableRegion( &gStatsFasthelpRegions[ 2 ] );
 
-					if ( Weapon[ gpItemDescObject->usItem ].bAutofireShotsPerFiveAP > 0 )
+					if ( GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 && GetShotsPerBurst(gpItemDescObject) <= 0 )
 					{
-						// AUTOFIRE SHOTS PER 5 AP
-						MSYS_EnableRegion( &gStatsFasthelpRegions[ 3 ] );
+						// Change help text to "Autofire Penalty" (no burst)
+						SetRegionFastHelpText( &(gStatsFasthelpRegions[ 2 ]), gzWeaponStatsFasthelp[ 27 ] );
 					}
+					if ( GetShotsPerBurst(gpItemDescObject) > 0 && GetAutofireShotsPerFiveAPs(gpItemDescObject) <= 0 )
+					{
+						// Change help text to "Burst Penalty" (no autofire)
+						SetRegionFastHelpText( &(gStatsFasthelpRegions[ 2 ]), gzWeaponStatsFasthelp[ 28 ] );
+					}
+				}
+
+				if ( GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 )
+				{
+					// AUTOFIRE SHOTS PER 5 AP
+					MSYS_EnableRegion( &gStatsFasthelpRegions[ 3 ] );
 				}
 			}
 				
@@ -3011,22 +3047,28 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
 				MSYS_EnableRegion( &gStatsFasthelpRegions[ 10 ] );
 			}
 
-			// BURST BONUS
-			if ( Item[ gpItemDescObject->usItem ].bursttohitbonus != 0 || Item[ gpItemDescObject->usItem ].autofiretohitbonus != 0 )
+			// AUTO BONUS
+			if ( Item[ gpItemDescObject->usItem ].autofiretohitbonus )
 			{
 				MSYS_EnableRegion( &gStatsFasthelpRegions[ 11 ] );
 			}
 
+			// BURST BONUS
+			if ( Item[ gpItemDescObject->usItem ].bursttohitbonus )
+			{
+				MSYS_EnableRegion( &gStatsFasthelpRegions[ 12 ] );
+			}
+
 			// RELIABILITY BONUS
 			if ( Item[ gpItemDescObject->usItem ].bReliability != 0 )
 			{
-				MSYS_EnableRegion( &gStatsFasthelpRegions[ 12 ] );
+				MSYS_EnableRegion( &gStatsFasthelpRegions[ 13 ] );
 			}
 
 			// NOISE SUPPRESSION
 			if ( Item[ gpItemDescObject->usItem ].percentnoisereduction > 0 )
 			{
-				MSYS_EnableRegion( &gStatsFasthelpRegions[ 13 ] );
+				MSYS_EnableRegion( &gStatsFasthelpRegions[ 14 ] );
 			}
 		}
 
@@ -3685,17 +3727,25 @@ void DrawWeaponStats( OBJECTTYPE * gpItemDescObject )
 	// Non-Launcher Guns Only
 	if ( Item[ gpItemDescObject->usItem ].usItemClass == IC_GUN && !Item[ gpItemDescObject->usItem].rocketlauncher )
 	{
-		if (GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 || GetShotsPerBurst(gpItemDescObject)> 0 )
-		{
+		if (GetShotsPerBurst(gpItemDescObject)> 0 && GetAutofireShotsPerFiveAPs(gpItemDescObject) <= 0 )
+			// BURST PENALTY ICON
+			BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoWeaponIcon, 30, BULLET_AUTOPEN_X, BULLET_AUTOPEN_Y, VO_BLT_SRCTRANSPARENCY, NULL );
+		else if (GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 && GetShotsPerBurst(gpItemDescObject) <= 0)
 			// AUTO PENALTY ICON
 			BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoWeaponIcon, 6, BULLET_AUTOPEN_X, BULLET_AUTOPEN_Y, VO_BLT_SRCTRANSPARENCY, NULL );
-			
+		else if (GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 && GetShotsPerBurst(gpItemDescObject) > 0 )
+			// BURST/AUTO PENALTY ICON
+			BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoWeaponIcon, 29, BULLET_AUTOPEN_X, BULLET_AUTOPEN_Y, VO_BLT_SRCTRANSPARENCY, NULL );
+
+		if (GetAutofireShotsPerFiveAPs(gpItemDescObject) > 0 || GetShotsPerBurst(gpItemDescObject)> 0 )
+		{
 			if ( Weapon[ gpItemDescObject->usItem ].bAutofireShotsPerFiveAP > 0 )
 			{
 				// AUTOFIRE SHOTS PER 5 AP ICON
 				BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoWeaponIcon, 7, BULLET_AUTO5AP_X, BULLET_AUTO5AP_Y, VO_BLT_SRCTRANSPARENCY, NULL );
 			}
 		}
+	
 	}
 		
 	//////////////////////////////////////////////////////////////////////
@@ -3800,10 +3850,15 @@ void DrawAmmoStats( OBJECTTYPE * gpItemDescObject )
 		BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoAmmoIcon, 11, BULLET_AMMOTOHITBON_X, BULLET_AMMOTOHITBON_Y, VO_BLT_SRCTRANSPARENCY, NULL );
 	}
 
-	// BURST BONUS
-	if ( Item[ gpItemDescObject->usItem ].bursttohitbonus != 0 || Item[ gpItemDescObject->usItem ].autofiretohitbonus != 0 )
+	// AUTO PENALTY BONUS
+	if ( Item[ gpItemDescObject->usItem ].autofiretohitbonus > 0 )
 	{
-		BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoAmmoIcon, 10, BULLET_AMMOBURSTBON_X, BULLET_AMMOBURSTBON_Y, VO_BLT_SRCTRANSPARENCY, NULL );
+		BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoAmmoIcon, 10, BULLET_AMMOAUTOBON_X, BULLET_AMMOAUTOBON_Y, VO_BLT_SRCTRANSPARENCY, NULL );
+	}
+	// BURST PENALTY BONUS
+	if ( Item[ gpItemDescObject->usItem ].bursttohitbonus > 0 )
+	{
+		BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoAmmoIcon, 15, BULLET_AMMOBURSTBON_X, BULLET_AMMOBURSTBON_Y, VO_BLT_SRCTRANSPARENCY, NULL );
 	}
 
 	// RELIABILITY BONUS
@@ -4539,7 +4594,7 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
 	if ( Item[ gpItemDescObject->usItem ].usItemClass == IC_GUN && !Item[ gpItemDescObject->usItem].rocketlauncher )
 	{
 
-		if ( GetShotsPerBurst(gpItemDescObject)> 0 )
+		if ( GetShotsPerBurst(gpItemDescObject)> 0 && ! GetAutofireShotsPerFiveAPs(gpItemDescObject) )
 		{
 			// BURST PENALTY
 			// equals
@@ -4562,10 +4617,23 @@ void DrawWeaponValues( OBJECTTYPE * gpItemDescObject )
 			
 			// print value
 			SetFontForeground( 5 );
-			swprintf( pStr, L"%2d", GetAutoPenalty( gpItemDescObject, FALSE ) );
+			swprintf( pStr, L"%d", GetAutoPenalty( gpItemDescObject, FALSE ) );
 			FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX + gWeaponStats[ 4 ].sValDx), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &usX, &usY);
 			mprintf( usX, usY, pStr );
 			SetFontForeground( 6 );
+
+			// Add BurstPenalty if necessary
+			if (GetShotsPerBurst(gpItemDescObject)> 0 )
+			{
+				// Colored white and placed in front of the auto penalty.
+				static CHAR16 pStr2[ 100 ];
+				SetFontForeground( FONT_WHITE );
+				swprintf(pStr2, L"%d/", GetBurstPenalty( gpItemDescObject, FALSE ) );
+				FindFontRightCoordinates( (INT16)(gWeaponStats[ 4 ].sX + gsInvDescX + gWeaponStats[ 4 ].sValDx) - StringPixLength(pStr,BLOCKFONT2), (INT16)(gWeaponStats[ 4 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr2, BLOCKFONT2, &usX, &usY);
+				mprintf( usX, usY, pStr2 );
+				SetFontForeground( 6 );
+			}
+
 		}
 
 		// Note "if" here to display this regardless of BURST PENALTY
@@ -4921,24 +4989,54 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
 		mprintf( sStrX, gWeaponStats[ 18 ].sY + gsInvDescY, pStr );
 	}
 
-	if ( Item[ gpItemDescObject->usItem ].bursttohitbonus != 0 || Item[ gpItemDescObject->usItem ].autofiretohitbonus != 0 )
+	if ( Item[ gpItemDescObject->usItem ].autofiretohitbonus )
 	{
-		// AMMO BURST/AUTO BONUS
+		// AUTO PENALTY MODIFIER
+		// equals
+		mprintf( gWeaponStats[ 40 ].sX + gsInvDescX, gWeaponStats[ 40 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 8 ] );	
+		SetFontForeground( 6 );
+
+		// determine value
+		INT16 iAutoBonus = 0;
+		iAutoBonus = Item[ gpItemDescObject->usItem ].autofiretohitbonus;
+
+		// determine value print color
+		SetFontForeground( 5 );
+		if ( iAutoBonus < 0 )
+		{
+			SetFontForeground( ITEMDESC_FONTNEGATIVE );
+		}
+		else if ( iAutoBonus > 0 )
+		{
+			SetFontForeground( ITEMDESC_FONTPOSITIVE );
+		}
+		
+		// print value
+		if ( iAutoBonus > 0 )
+		{
+			swprintf( pStr, L"%+2d", iAutoBonus );
+		}
+		else
+		{
+			swprintf( pStr, L"%2d", iAutoBonus );
+		}
+
+		uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
+		FindFontRightCoordinates( (INT16)(gWeaponStats[ 19 ].sX + gsInvDescX + gWeaponStats[ 19 ].sValDx), (INT16)(gWeaponStats[ 19 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
+		mprintf( sStrX, gWeaponStats[ 19 ].sY + gsInvDescY, pStr );
+	}
+
+	if ( Item[ gpItemDescObject->usItem ].bursttohitbonus )
+	{
+		// BURST PENALTY MODIFIER
 		// equals
 		SetFontForeground( 6 );
-		mprintf( gWeaponStats[ 40 ].sX + gsInvDescX, gWeaponStats[ 40 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 8 ] );
+		mprintf( gWeaponStats[ 41 ].sX + gsInvDescX, gWeaponStats[ 41 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 8 ] );	
 
 		// determine value
 		INT16 iBurstBonus = 0;
-		if ( Item[ gpItemDescObject->usItem ].bursttohitbonus > 0 || Item[ gpItemDescObject->usItem ].autofiretohitbonus > 0)
-		{
-			iBurstBonus = __max( Item[ gpItemDescObject->usItem ].bursttohitbonus, Item[ gpItemDescObject->usItem ].autofiretohitbonus ) ;
-		}
-		else
-		{	
-			iBurstBonus = __min( Item[ gpItemDescObject->usItem ].bursttohitbonus, Item[ gpItemDescObject->usItem ].autofiretohitbonus ) ;
-		}
-		
+		iBurstBonus = Item[ gpItemDescObject->usItem ].bursttohitbonus;
+
 		// determine value print color
 		SetFontForeground( 5 );
 		if ( iBurstBonus < 0 )
@@ -4959,9 +5057,10 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
 		{
 			swprintf( pStr, L"%2d", iBurstBonus );
 		}
+
 		uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
-		FindFontRightCoordinates( (INT16)(gWeaponStats[ 19 ].sX + gsInvDescX + gWeaponStats[ 19 ].sValDx), (INT16)(gWeaponStats[ 19 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
-		mprintf( sStrX, gWeaponStats[ 19 ].sY + gsInvDescY, pStr );
+		FindFontRightCoordinates( (INT16)(gWeaponStats[ 20 ].sX + gsInvDescX + gWeaponStats[ 20 ].sValDx), (INT16)(gWeaponStats[ 20 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
+		mprintf( sStrX, gWeaponStats[ 20 ].sY + gsInvDescY, pStr );
 	}
 
 	if ( Item[ gpItemDescObject->usItem ].bReliability != 0 )
@@ -4969,7 +5068,7 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
 		// AMMO RELIABILITY BONUS
 		// equals
 		SetFontForeground( 6 );
-		mprintf( gWeaponStats[ 41 ].sX + gsInvDescX, gWeaponStats[ 41 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 8 ] );
+		mprintf( gWeaponStats[ 42 ].sX + gsInvDescX, gWeaponStats[ 42 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 8 ] );
 
 		// determine value
 		INT16 iReliabilityBonus = 0;
@@ -4996,8 +5095,8 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
 			swprintf( pStr, L"%2d", iReliabilityBonus );
 		}
 		uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
-		FindFontRightCoordinates( (INT16)(gWeaponStats[ 20 ].sX + gsInvDescX + gWeaponStats[ 20 ].sValDx), (INT16)(gWeaponStats[ 20 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
-		mprintf( sStrX, gWeaponStats[ 20 ].sY + gsInvDescY, pStr );
+		FindFontRightCoordinates( (INT16)(gWeaponStats[ 21 ].sX + gsInvDescX + gWeaponStats[ 21 ].sValDx), (INT16)(gWeaponStats[ 21 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
+		mprintf( sStrX, gWeaponStats[ 21 ].sY + gsInvDescY, pStr );
 	}
 
 	if ( Item[ gpItemDescObject->usItem ].percentnoisereduction > 0 )
@@ -5005,7 +5104,7 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
 		// AMMO NOISE SUPPRESSION
 		// equals
 		SetFontForeground( 6 );
-		//mprintf( gWeaponStats[ 41 ].sX + gsInvDescX, gWeaponStats[ 41 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 8 ] );
+		//mprintf( gWeaponStats[ 43 ].sX + gsInvDescX, gWeaponStats[ 43 ].sY + gsInvDescY, L"%s", gWeaponStatsDesc[ 8 ] );
 
 		// determine value
 		INT16 iNoiseSuppression = 0;
@@ -5031,7 +5130,7 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
 			swprintf( pStr, L"%2d%%", iNoiseSuppression );
 		}
 		uiStringLength=StringPixLength(pStr, ITEMDESC_FONT );
-		FindFontRightCoordinates( (INT16)(gWeaponStats[ 21 ].sX + gsInvDescX + gWeaponStats[ 21 ].sValDx), (INT16)(gWeaponStats[ 21 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
+		FindFontRightCoordinates( (INT16)(gWeaponStats[ 22 ].sX + gsInvDescX + gWeaponStats[ 22 ].sValDx), (INT16)(gWeaponStats[ 22 ].sY + gsInvDescY ), ITEM_STATS_WIDTH ,ITEM_STATS_HEIGHT ,pStr, BLOCKFONT2, &sStrX, &usY);
 		
 		#ifdef CHINESE
 			wcscat( pStr, ChineseSpecString1 );
@@ -5039,7 +5138,7 @@ void DrawAmmoValues( OBJECTTYPE * gpItemDescObject, int shotsLeft )
 			wcscat( pStr, L"%%" );
 		#endif
 
-		mprintf( sStrX, gWeaponStats[ 21 ].sY + gsInvDescY, pStr );
+		mprintf( sStrX, gWeaponStats[ 22 ].sY + gsInvDescY, pStr );
 	}
 }
 

Utils/Text.h

@@ -414,8 +414,8 @@ extern CHAR16		gMoneyStatsDesc[][ 13 ];
 extern CHAR16		gWeaponStatsDesc[][ 16 ];
 // HEADROCK: Added externs for Item Description Box icon and stat tooltips
 // Note that I've inflated some of these to 20 to avoid issues.
-extern STR16		gzWeaponStatsFasthelp[ 27 ];
-extern STR16		gzWeaponStatsFasthelpTactical[ 27 ];
+extern STR16		gzWeaponStatsFasthelp[ 29 ];
+extern STR16		gzWeaponStatsFasthelpTactical[ 29 ];
 extern STR16		gzAmmoStatsFasthelp[ 20 ];
 extern STR16		gzArmorStatsFasthelp[ 20 ];
 extern STR16		gzExplosiveStatsFasthelp[ 20 ];

Utils/_ChineseText.cpp

@@ -1115,11 +1115,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"射程",
 	L"杀伤",
-	L"点射/自动惩罚",
+	L"点射/自动惩罚 (Lower is better)",
 	L"连发数量/5AP",
 	L"精度",
 	L"可靠性",
@@ -1144,13 +1144,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"无点射模式！",
 	L"无连发模式！",
 	L"格斗AP",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"射程",
 	L"杀伤",
-	L"点射/连发惩罚",
+	L"点射/连发惩罚（越低越好）",
 	L"连发数量/5AP",
 	L"精度",
 	L"可靠性",
@@ -1175,6 +1177,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"无点射模式！",
 	L"无连发模式！",
 	L"击打所需AP",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1190,6 +1194,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"射程修正",
 	L"杀伤修正",
 	L"命中修正",
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"点射/连发惩罚修正（越高越好）",
 	L"可靠性修正",
 	L"噪音修正（越低越好）",
@@ -1198,7 +1203,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_DutchText.cpp

@@ -1103,11 +1103,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (Lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1132,13 +1132,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (Lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1163,6 +1165,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1178,6 +1182,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Range Modifier",
 	L"Damage Modifier",
 	L"To-Hit Modifier",
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"Burst/Auto Penalty Modifier (Higher is better)",
 	L"Reliability Modifier",
 	L"Loudness Modifier (Lower is better)",
@@ -1186,7 +1191,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_EnglishText.cpp

@@ -1115,11 +1115,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1131,7 +1131,7 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"APs to Reload",
 	L"APs to Reload Manually",
 	L"Flash Suppression",
-	L"Loudness (Lower is better)",
+	L"Loudness (lower is better)",
 	L"To-Hit Modifier",
 	L"Average Best Laser Range",
 	L"Aiming Modifier",
@@ -1144,13 +1144,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (Lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1175,9 +1177,11 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzAmmoStatsFasthelp[ 20 ] =
+STR16			gzAmmoStatsFasthelp[ 20 ] =
 {
 	L"Armor Penetration (Lower is better)",
 	L"Bullet Tumble (Higher is better)",
@@ -1190,6 +1194,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Range Modifier",
 	L"Damage Modifier",
 	L"To-Hit Modifier",
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"Burst/Auto Penalty Modifier (Higher is better)",
 	L"Reliability Modifier",
 	L"Loudness Modifier (Lower is better)",
@@ -1198,7 +1203,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_FrenchText.cpp

@@ -1116,11 +1116,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Portée",
 	L"Dégats",
-	L"Pénalité Rafale/Auto",
+	L"Pénalité Rafale/Auto (Moins c'est mieux)",
 	L"Nombre de tirs pour 5 PA",
 	L"Précision",
 	L"Fiabilité",
@@ -1145,13 +1145,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"Pas de tir en rafale!",
 	L"Pas de tir auto.!",
 	L"PA pour frapper",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Portée",
 	L"Dégats",
-	L"Pénalité Rafale/Auto",
+	L"Pénalité Rafale/Auto (Moins c'est mieux)",
 	L"Nombre de tirs pour 5 PA",
 	L"Précision",
 	L"Fiabilité",
@@ -1176,6 +1178,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"Pas de tir en rafale!",
 	L"Pas de tir auto.!",
 	L"PA pour frapper",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1191,6 +1195,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Facteur de portée",
 	L"Facteur de dégats",
 	L"Facteur de toucher",
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"Facteur de pénalité rafle/auto. (Plus c'est mieux)",
 	L"Facteur de fiabilité",
 	L"Facteur d'intensité sonore (Moins c'est mieux)",
@@ -1199,7 +1204,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_GermanText.cpp

@@ -1084,11 +1084,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Reichweite",
 	L"Schaden",
-	L"Burst/Auto Strafe",
+	L"Burst/Auto Strafe (Niedriger ist besser)",
 	L"Autofeuer Schüsse für 5 AP",
 	L"Genauigkeit",
 	L"Zuverlässigkeit",
@@ -1113,13 +1113,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"Kein Feuerstoß!",
 	L"Kein Autofeuer!",
 	L"APs zum Schlagen",
+	L"Autofeuer Strafe (Niedriger ist besser)",
+    L"Feuerstoß Strafe (Niedriger ist besser)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Reichweite",
 	L"Schaden",
-	L"Feuerstoß/Autofeuer Strafe",
+	L"Feuerstoß/Autofeuer Strafe (Niedriger ist besser)",
 	L"Autofeuer Schüsse für 5 AP",
 	L"Genauigkeit",
 	L"Zuverlässigkeit",
@@ -1144,6 +1146,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"Kein Feuerstoß!",
 	L"Kein Autofeuer!",
 	L"APs zum Schlagen",
+	L"Autofeuer Strafe (Niedriger ist besser)",
+    L"Feuerstoß Strafe (Niedriger ist besser)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1159,6 +1163,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Reichweite MOdifikator",
 	L"Schaden Modifikator",
 	L"Treffer Modifikator",
+	L"Autofeuer Strafe Modifikator (Höher ist besser)",
 	L"Feuerstoß/Autofeuer Strafe Modifikator (Höher ist besser)",
 	L"Zuverlässigkeits Modifikator",
 	L"Lautstärke Modifikator (Niedriger ist besser)",
@@ -1167,7 +1172,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_ItalianText.cpp

@@ -1099,11 +1099,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (Lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1128,13 +1128,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (Lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1159,6 +1161,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1174,6 +1178,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Range Modifier",
 	L"Damage Modifier",
 	L"To-Hit Modifier",
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"Burst/Auto Penalty Modifier (Higher is better)",
 	L"Reliability Modifier",
 	L"Loudness Modifier (Lower is better)",
@@ -1182,7 +1187,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_PolishText.cpp

@@ -1108,11 +1108,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Zas.",
 	L"Obra¿.",
-	L"PA:",
+	L"PA: (mniej - lepiej)",
 	L"Auto/5AP",
 	L"CelnoϾ",
 	L"Stan",
@@ -1137,13 +1137,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"Wy³. seriê!",
 	L"Wy³. auto!",
 	L"AP/cios-³om",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Zas.",
 	L"Obra¿.",
-	L"PA:",
+	L"PA: (mniej - lepiej)",
 	L"Auto/5AP",
 	L"CelnoϾ",
 	L"Stan",
@@ -1168,6 +1170,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"Wy³. seriê!",
 	L"Wy³. auto!",
 	L"AP/cios-³om",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1183,6 +1187,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Modyf. zasg.",
 	L"Modyf. obra¿eñ",
 	L"Modyf. trafieñ",
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"Modyf. kary za seriê/auto (wiêcej – lepiej)",
 	L"Modyf. sprawnoœci",
 	L"Modyf. g³oœnoœci (mniej - lepiej)",
@@ -1191,7 +1196,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_RussianText.cpp

@@ -1113,11 +1113,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Äàëüíîáîéíîñòü",						//Range
 	L"Óðîí",							//Damage
-	L"Штраф за отдачу при\nстрельбе очередью\n(c отсечкой/без)",	//Burst/Auto Penalty
+	L"Øòðàô çà îòäà÷ó ïðè\nñòðåëüáå î÷åðåäüþ\n(c îòñå÷êîé/áåç) (÷åì ìåíüøå, òåì ëó÷øå)",	//Burst/Auto Penalty
 	L"Âûñòðåëîâ â àâòîìàòè÷åñêîì\nðåæèìå çà 5 ÎÄ",			//Autofire shots per 5 AP
 	L"Òî÷íîñòü",							//Accuracy
 	L"Íàä¸æíîñòü",							//Reliability
@@ -1142,13 +1142,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"Íåò îòñå÷êè ïàòðîíà!",					//No Burst Mode!
 	L"Íåò àâòîìàòè÷åñêîãî ðåæèìà!",					//No Auto Mode!
 	L"ÎÄ íà óäàð",							//APs to Bash
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Äàëüíîáîéíîñòü",
 	L"Óðîí",
-	L"Штраф за отдачу при\nстрельбе очередью\n(c отсечкой/без)",
+	L"Øòðàô çà îòäà÷ó ïðè\nñòðåëüáå î÷åðåäüþ\n(c îòñå÷êîé/áåç) (Lower is better)",
 	L"Âûñòðåëîâ â àâòîìàòè÷åñêîì\nðåæèìå çà 5 ÎÄ",
 	L"Òî÷íîñòü",
 	L"Íàä¸æíîñòü",
@@ -1173,6 +1175,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"Íåò îòñå÷êè ïàòðîíà!",
 	L"Íåò àâòîìàòè÷åñêîãî ðåæèìà!",
 	L"ÎÄ íà óäàð",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1188,6 +1192,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Ìîäèôèêàòîð äàëüíîáîéíîñòè",				//Range Modifier
 	L"Ìîäèôèêàòîð óðîíà",					//Damage Modifier
 	L"Ìîäèôèêàòîð òî÷íîñòè",				//To-Hit Modifier
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"Ìîäèôèêàòîð øòðàôà\nçà îòäà÷ó ïðè\nñòðåëüáå î÷åðåäüþ\n(c îòñå÷êîé/áåç)",	//Burst/Auto Penalty Modifier (Higher is better)",
 	L"Ìîäèôèêàòîð íàä¸æíîñòè",				//Reliability Modifier
 	L"Ìîäèôèêàòîð øóìíîñòè\n(÷åì ìåíüøå, òåì ëó÷øå)",	//Loudness Modifier (Lower is better)
@@ -1196,7 +1201,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =

Utils/_TaiwaneseText.cpp

@@ -1114,11 +1114,11 @@ CHAR16		gWeaponStatsDesc[][ 16 ] =
 // HEADROCK: Several arrays of tooltip text for new Extended Description Box
 // Please note, several of these are artificially inflated to 19 entries to help fix a complication with
 // changing item type while watching its description box
-STR16		gzWeaponStatsFasthelp[ 27 ] =
+STR16		gzWeaponStatsFasthelp[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (Lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1143,13 +1143,15 @@ STR16		gzWeaponStatsFasthelp[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
-STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
+STR16		gzWeaponStatsFasthelpTactical[ 29 ] =
 {
 	L"Range",
 	L"Damage",
-	L"Burst/Auto Penalty",
+	L"Burst/Auto Penalty (Lower is better)",
 	L"Autofire shots per 5 AP",
 	L"Accuracy",
 	L"Reliability",
@@ -1174,6 +1176,8 @@ STR16		gzWeaponStatsFasthelpTactical[ 27 ] =
 	L"No Burst Mode!",
 	L"No Auto Mode!",
 	L"APs to Bash",
+	L"Autofire Penalty (Lower is better)",
+    L"Burst Penalty (Lower is better)",
 };
 
 STR16		gzAmmoStatsFasthelp[ 20 ] =
@@ -1189,6 +1193,7 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"Range Modifier",
 	L"Damage Modifier",
 	L"To-Hit Modifier",
+	L"Autofire Penalty Modifier (Higher is better)",
 	L"Burst/Auto Penalty Modifier (Higher is better)",
 	L"Reliability Modifier",
 	L"Loudness Modifier (Lower is better)",
@@ -1197,7 +1202,6 @@ STR16		gzAmmoStatsFasthelp[ 20 ] =
 	L"",
 	L"",
 	L"",
-	L"",
 };
 
 STR16		gzArmorStatsFasthelp[ 20 ] =