Update disease flags (hand and face) so that they can be used on the same item (#143)

* Allow an item to have both disease flags enabled

* Remove extra line break for disease hand protection helptext

Tactical/Interface Enhanced.cpp

@@ -2728,7 +2728,7 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
 				MSYS_EnableRegion( &gUDBFasthelpRegions[iFirstDataRegion + cnt] );
 				cnt++;
 			}
-			else if ( HasItemFlag( gpItemDescObject->usItem, DISEASEPROTECTION_2 ) )
+			if ( HasItemFlag( gpItemDescObject->usItem, DISEASEPROTECTION_2 ) )
 			{
 				swprintf( pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[39], szUDBGenSecondaryStatsExplanationsTooltipText[39] );
 				SetRegionFastHelpText( &(gUDBFasthelpRegions[iFirstDataRegion + cnt]), pStr );
@@ -6420,7 +6420,7 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
 			BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 37, gItemDescGenSecondaryRegions[cnt].sLeft + sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop + sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL );
 			++cnt;
 		}
-		else if ( (HasItemFlag( gpItemDescObject->usItem, DISEASEPROTECTION_2 ) && !fComparisonMode) ||
+		if ( (HasItemFlag( gpItemDescObject->usItem, DISEASEPROTECTION_2 ) && !fComparisonMode) ||
 				  (fComparisonMode && HasItemFlag( gpComparedItemDescObject->usItem, DISEASEPROTECTION_2 )) )
 		{
 			BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 37, gItemDescGenSecondaryRegions[cnt].sLeft + sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop + sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL );

Tactical/Soldier Control.cpp

@@ -19923,7 +19923,7 @@ FLOAT  SOLDIERTYPE::GetDiseaseContactProtection( )
 				{
 					bestfacegear = max( bestfacegear, (FLOAT)((*pObj)[0]->data.objectStatus / 100) );
 				}
-				else if ( HasItemFlag( pObj->usItem, DISEASEPROTECTION_2 ) )
+				if ( HasItemFlag( pObj->usItem, DISEASEPROTECTION_2 ) )
 				{
 					bestprotectivegear = max( bestprotectivegear, (FLOAT)((*pObj)[0]->data.objectStatus / 100) );
 				}

Utils/_ChineseText.cpp

@@ -8730,7 +8730,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
 	L"\n \n这个物品会挡住准心，你无法再使\n用准心瞄准。", //L"\n \nThis item will block your iron sights\nso you cannot use them.",
 	L"\n \n这种弹药可以破坏发光的墙。\n或者其它不同种类的物品。", //L"\n \nThis ammo can destroy light walls\nand various other objects.",
 	L"\n \n如果你脸上带了这个，这就将降低\n传播给其他人的几率。", //L"\n \nIf worn on your face, this will lower\nthe chance to be infected by other people.",
-	L"\n \n如果保存在物品栏\n降低\n传染给其他人的几率。", //L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
+	L"\n \n如果保存在物品栏降低\n传染给其他人的几率。", //L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
 	L"\n \n拿在手里，就可以抵挡前方的伤害。", //L"\n \nIf equipped in a hand, this will block incoming damage.",
 	L"\n \n你可以使用它拍照。",		//L"\n \nYou can take photos with this.",
 	L"\n \n这个物品能让你更有效地掩埋尸体。", //L"\n \nThis item makes you more effective at burying corpses.",

Utils/_DutchText.cpp

@@ -8740,7 +8740,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
 	L"\n \nThis item will block your iron sights\nso you cannot use them.",
 	L"\n \nThis ammo can destroy light walls\nand various other objects.",	// TODO.Translate
 	L"\n \nIf worn on your face, this will lower\nthe chance to be infected by other people.",
-	L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
+	L"\n \nIf kept in your inventory, this will lower\nthe chance to be infected by other people.",
 	L"\n \nIf equipped in a hand, this will block incoming damage.",	// TODO.Translate
 	L"\n \nYou can take photos with this.",		// TODO.Translate
 	L"\n \nThis item makes you more effective at burying corpses.",

Utils/_EnglishText.cpp

@@ -8730,7 +8730,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
 	L"\n \nThis item will block your iron sights\nso you cannot use them.",
 	L"\n \nThis ammo can destroy light walls\nand various other objects.",
 	L"\n \nIf worn on your face, this will lower\nthe chance to be infected by other people.",
-	L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
+	L"\n \nIf kept in your inventory, this will lower\nthe chance to be infected by other people.",
 	L"\n \nIf equipped in a hand, this will block incoming damage.",
 	L"\n \nYou can take photos with this.",
 	L"\n \nThis item makes you more effective at burying corpses.",

Utils/_FrenchText.cpp

@@ -8727,7 +8727,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
 	L"\n \nCet Objet bloquera votre viseur\nde ce fait vous ne pouvez pas l'utiliser.",
 	L"\n \nThis ammo can destroy light walls\nand various other objects.",	// TODO.Translate
 	L"\n \nIf worn on your face, this will lower\nthe chance to be infected by other people.",
-	L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
+	L"\n \nIf kept in your inventory, this will lower\nthe chance to be infected by other people.",
 	L"\n \nIf equipped in a hand, this will block incoming damage.",	// TODO.Translate
 	L"\n \nYou can take photos with this.",		// TODO.Translate
 	L"\n \nThis item makes you more effective at burying corpses.",

Utils/_GermanText.cpp

@@ -8583,7 +8583,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
 	L"\n \nDieser Gegenstand verhindert die Verwendung von Kimme und Korn.",
 	L"\n \nThis ammo can destroy light walls\nand various other objects.",	// TODO.Translate
 	L"\n \nIf worn on your face, this will lower\nthe chance to be infected by other people.",
-	L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
+	L"\n \nIf kept in your inventory, this will lower\nthe chance to be infected by other people.",
 	L"\n \nIf equipped in a hand, this will block incoming damage.",	// TODO.Translate
 	L"\n \nYou can take photos with this.",		// TODO.Translate
 	L"\n \nThis item makes you more effective at burying corpses.",

Utils/_ItalianText.cpp

@@ -8730,7 +8730,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
 	L"\n \nThis item will block your iron sights\nso you cannot use them.",
 	L"\n \nThis ammo can destroy light walls\nand various other objects.",	// TODO.Translate
 	L"\n \nIf worn on your face, this will lower\nthe chance to be infected by other people.",
-	L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
+	L"\n \nIf kept in your inventory, this will lower\nthe chance to be infected by other people.",
 	L"\n \nIf equipped in a hand, this will block incoming damage.",	// TODO.Translate
 	L"\n \nYou can take photos with this.",		// TODO.Translate
 	L"\n \nThis item makes you more effective at burying corpses.",

Utils/_PolishText.cpp

@@ -8742,7 +8742,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
 	L"\n \nThis item will block your iron sights\nso you cannot use them.",
 	L"\n \nThis ammo can destroy light walls\nand various other objects.",	// TODO.Translate
 	L"\n \nIf worn on your face, this will lower\nthe chance to be infected by other people.",
-	L"\n \nIf kept in your inventory, this will\nlower\nthe chance to be infected by other people.",
+	L"\n \nIf kept in your inventory, this will lower\nthe chance to be infected by other people.",
 	L"\n \nIf equipped in a hand, this will block incoming damage.",	// TODO.Translate
 	L"\n \nYou can take photos with this.",		// TODO.Translate
 	L"\n \nThis item makes you more effective at burying corpses.",