1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added new records: diseases caught, interrogations, total damage taken, total damage dealt

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8376 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-01-26 20:46:26 +00:00
parent e643c1ea57
commit 5f2da3707c
12 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/personnel.cpp
+28 -9
View File
@@ -8644,8 +8644,6 @@ void AssignPersonnelAssistsHelpText( INT32 ubProfile )
// Set region help text
SetRegionFastHelpText( &(gSkillTraitHelpTextRegion[8]), apStr );
SetRegionHelpEndCallback( &gSkillTraitHelpTextRegion[8], MSYS_NO_CALLBACK );
return;
}
void AssignPersonnelHitPercentageHelpText( INT32 ubProfile )
@@ -8689,12 +8687,15 @@ void AssignPersonnelHitPercentageHelpText( INT32 ubProfile )
swprintf(atStr, pPersonnelRecordsHelpTexts[ 16 ], gMercProfiles[ubProfile].records.usShotsHit );
wcscat( apStr, atStr );
}
if ( gMercProfiles[ubProfile].records.usDamageDealt > 0 || fShowRecordsIfZero )
{
swprintf( atStr, pPersonnelRecordsHelpTexts[52], gMercProfiles[ubProfile].records.usDamageDealt );
wcscat( apStr, atStr );
}
// Set region help text
SetRegionFastHelpText( &(gSkillTraitHelpTextRegion[9]), apStr );
SetRegionHelpEndCallback( &gSkillTraitHelpTextRegion[9], MSYS_NO_CALLBACK );
return;
}
void AssignPersonnelAchievementsHelpText( INT32 ubProfile )
@@ -8800,12 +8801,15 @@ void AssignPersonnelAchievementsHelpText( INT32 ubProfile )
swprintf(atStr, pPersonnelRecordsHelpTexts[ 30 ], gMercProfiles[ubProfile].records.ubQuestsHandled );
wcscat( apStr, atStr );
}
if ( gMercProfiles[ubProfile].records.usInterrogations > 0 || fShowRecordsIfZero )
{
swprintf( atStr, pPersonnelRecordsHelpTexts[49], gMercProfiles[ubProfile].records.usInterrogations );
wcscat( apStr, atStr );
}
// Set region help text
SetRegionFastHelpText( &(gSkillTraitHelpTextRegion[10]), apStr );
SetRegionHelpEndCallback( &gSkillTraitHelpTextRegion[10], MSYS_NO_CALLBACK );
return;
}
void AssignPersonnelBattlesHelpText( INT32 ubProfile )
@@ -8899,6 +8903,18 @@ void AssignPersonnelWoundsHelpText( INT32 ubProfile )
wcscat( apStr, atStr );
}
if ( gMercProfiles[ubProfile].records.usTimesInfected > 0 || fShowRecordsIfZero )
{
swprintf( atStr, pPersonnelRecordsHelpTexts[50], gMercProfiles[ubProfile].records.usTimesInfected );
wcscat( apStr, atStr );
}
if ( gMercProfiles[ubProfile].records.usDamageTaken > 0 || fShowRecordsIfZero )
{
swprintf( atStr, pPersonnelRecordsHelpTexts[51], gMercProfiles[ubProfile].records.usDamageTaken );
wcscat( apStr, atStr );
}
// Set region help text
SetRegionFastHelpText( &(gSkillTraitHelpTextRegion[12]), apStr );
SetRegionHelpEndCallback( &gSkillTraitHelpTextRegion[12], MSYS_NO_CALLBACK );
@@ -8946,8 +8962,9 @@ INT8 CalculateMercsAchievementPercentage( INT32 ubProfile )
+
( gMercProfiles[ pTeamSoldier->ubProfile ].records.usMilitiaTrained /4)
+
( gMercProfiles[ pTeamSoldier->ubProfile ].records.ubQuestsHandled *2);
( gMercProfiles[ pTeamSoldier->ubProfile ].records.ubQuestsHandled *2)
+
(gMercProfiles[pTeamSoldier->ubProfile].records.usInterrogations);
}
}
}
@@ -8978,7 +8995,9 @@ INT8 CalculateMercsAchievementPercentage( INT32 ubProfile )
+
( gMercProfiles[ ubProfile ].records.usMilitiaTrained /4)
+
( gMercProfiles[ ubProfile ].records.ubQuestsHandled *2);
( gMercProfiles[ ubProfile ].records.ubQuestsHandled *2)
+
( gMercProfiles[ubProfile].records.usInterrogations );
// Calculate percentage
if( ulTotalMercPoints != 0 )