Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rftrdev merged 2 commits into from
May 15, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d75e3d
Allow an item to have both disease flags enabled
rftrdev May 15, 2023
e63d3df
Remove extra line break for disease hand protection helptext
rftrdev May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tactical/Interface Enhanced.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion Tactical/Soldier Control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) );
}
Expand Down
2 changes: 1 addition & 1 deletion Utils/_ChineseText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Utils/_DutchText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Utils/_EnglishText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Utils/_FrenchText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Utils/_GermanText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Utils/_ItalianText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion Utils/_PolishText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down