Display icon and tooltip for belt fed weapons (#155)

This commit is contained in:
Asdow
2023-05-26 08:12:55 +03:00
committed by GitHub
parent 66c7fc1c8d
commit f2ab296b49
9 changed files with 31 additions and 2 deletions
+15 -2
View File
@@ -2640,7 +2640,14 @@ void InternalInitEDBTooltipRegion( OBJECTTYPE * gpItemDescObject, UINT32 guiCurr
//////////////////// EXTERNAL FEEDING //////////////////// EXTERNAL FEEDING
if ( gGameExternalOptions.ubExternalFeeding ) if ( gGameExternalOptions.ubExternalFeeding )
{ {
if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) ) if (HasItemFlag(gpItemDescObject->usItem, BELT_FED))
{
swprintf(pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[51], szUDBGenSecondaryStatsExplanationsTooltipText[51]);
SetRegionFastHelpText(&(gUDBFasthelpRegions[iFirstDataRegion + cnt]), pStr);
MSYS_EnableRegion(&gUDBFasthelpRegions[iFirstDataRegion + cnt]);
cnt++;
}
else if ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) )
{ {
swprintf( pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[ 28 ], szUDBGenSecondaryStatsExplanationsTooltipText[ 28 ]); swprintf( pStr, L"%s%s", szUDBGenSecondaryStatsTooltipText[ 28 ], szUDBGenSecondaryStatsExplanationsTooltipText[ 28 ]);
SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + cnt ]), pStr ); SetRegionFastHelpText( &(gUDBFasthelpRegions[ iFirstDataRegion + cnt ]), pStr );
@@ -6340,7 +6347,13 @@ void DrawSecondaryStats( OBJECTTYPE * gpItemDescObject )
//////////////////// EXTERNAL FEEDING //////////////////// EXTERNAL FEEDING
if ( gGameExternalOptions.ubExternalFeeding ) if ( gGameExternalOptions.ubExternalFeeding )
{ {
if ( ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) && !fComparisonMode ) || if ((HasItemFlag(gpItemDescObject->usItem, BELT_FED) && !fComparisonMode) ||
(fComparisonMode && HasItemFlag(gpComparedItemDescObject->usItem, BELT_FED)))
{
BltVideoObjectFromIndex(guiSAVEBUFFER, guiItemInfoSecondaryIcon, 28, gItemDescGenSecondaryRegions[cnt].sLeft + sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop + sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL);
cnt++;
}
else if ( ( HasItemFlag(gpItemDescObject->usItem, AMMO_BELT) && !fComparisonMode ) ||
( fComparisonMode && HasItemFlag(gpComparedItemDescObject->usItem, AMMO_BELT) ) ) ( fComparisonMode && HasItemFlag(gpComparedItemDescObject->usItem, AMMO_BELT) ) )
{ {
BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 28, gItemDescGenSecondaryRegions[cnt].sLeft+sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop+sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL ); BltVideoObjectFromIndex( guiSAVEBUFFER, guiItemInfoSecondaryIcon, 28, gItemDescGenSecondaryRegions[cnt].sLeft+sOffsetX, gItemDescGenSecondaryRegions[cnt].sTop+sOffsetY, VO_BLT_SRCTRANSPARENCY, NULL );
+2
View File
@@ -8688,6 +8688,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|医|用|夹|板", //L"|M|e|d|i|c|a|l |S|p|l|i|n|t", L"|医|用|夹|板", //L"|M|e|d|i|c|a|l |S|p|l|i|n|t",
L"|阻|燃|弹|药", //L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", L"|阻|燃|弹|药", //L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o",
L"|燃|烧|弹|药", //L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|燃|烧|弹|药", //L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8743,6 +8744,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \n一旦应用, 这个物品可以提高对你的手臂\n或者腿部重伤的治疗速率。", //L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", L"\n \n一旦应用, 这个物品可以提高对你的手臂\n或者腿部重伤的治疗速率。", //L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.",
L"\n \n这种弹药可以灭火。", //L"\n \nThis ammo can extinguish fire.", L"\n \n这种弹药可以灭火。", //L"\n \nThis ammo can extinguish fire.",
L"\n \n这种弹药会引起燃烧(火灾)。", //L"\n \nThis ammo can cause fire.", L"\n \n这种弹药会引起燃烧(火灾)。", //L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -8698,6 +8698,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8753,6 +8754,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.", L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -8688,6 +8688,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", L"|M|e|d|i|c|a|l |S|p|l|i|n|t",
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8743,6 +8744,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.",
L"\n \nThis ammo can extinguish fire.", // 49 L"\n \nThis ammo can extinguish fire.", // 49
L"\n \nThis ammo can cause fire.", L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -8685,6 +8685,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8740,6 +8741,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.", L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -8541,6 +8541,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8596,6 +8597,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.", L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -8688,6 +8688,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8743,6 +8744,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.", L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -8700,6 +8700,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8755,6 +8756,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.", L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=
+2
View File
@@ -8683,6 +8683,7 @@ STR16 szUDBGenSecondaryStatsTooltipText[]=
L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate L"|M|e|d|i|c|a|l |S|p|l|i|n|t", // TODO.Translate
L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate L"|F|i|r|e |R|e|t|a|r|d|a|n|t |A|m|m|o", // 49 TODO.Translate
L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o", L"|I|n|c|e|n|d|i|a|r|y |A|m|m|o",
L"|B|e|l|t| |F|e|d",
}; };
STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]= STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
@@ -8738,6 +8739,7 @@ STR16 szUDBGenSecondaryStatsExplanationsTooltipText[]=
L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate L"\n \nOnce applied, this item increases the healing\nspeed of severe wounds to either your arms or legs.", // TODO.Translate
L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate L"\n \nThis ammo can extinguish fire.", // 49 TODO.Translate
L"\n \nThis ammo can cause fire.", L"\n \nThis ammo can cause fire.",
L"\n \nThis gun can be belt fed\nfrom a compatible LBE\nor by another merc.",
}; };
STR16 szUDBAdvStatsTooltipText[]= STR16 szUDBAdvStatsTooltipText[]=