- Changed INI-Property "RANDOM_STATS" from int (0 - 3) to boolean value

FALSE = Do not use random stats (JA2 vanilla setting)
  TRUE = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5982 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-04-04 21:49:33 +00:00
parent 2fc4ccf167
commit 6bd8399bb9
3 changed files with 3 additions and 9 deletions
+1 -1
View File
@@ -849,7 +849,7 @@ void LoadGameExternalOptions()
// Buggler: setting to show/hide skills/traits in AIM & MERC hiring page
gGameExternalOptions.fShowSkillsInHirePage = iniReader.ReadBoolean("Recruitment Settings", "SHOW_SKILLS_IN_HIRING_PAGE", FALSE);
gGameExternalOptions.ubMercRandomStats = iniReader.ReadInteger("Recruitment Settings", "MERCS_RANDOM_STATS", 0, 0, 2);
gGameExternalOptions.fMercRandomStats = iniReader.ReadBoolean("Recruitment Settings", "MERCS_RANDOM_STATS", FALSE);
//################# Financial Settings #################
+1 -1
View File
@@ -1141,7 +1141,7 @@ typedef struct
BOOLEAN fShowSkillsInHirePage;
UINT8 ubMercRandomStats;
BOOLEAN fMercRandomStats;
BOOLEAN fBobbyRayFastShipments;
+1 -7
View File
@@ -439,13 +439,7 @@ void RandomStats ()
for ( cnt = 0; cnt < NUM_PROFILES; cnt++ )
{
BOOLEAN randomStatsEnabled = FALSE;
// WANNE: Random Stats are based on the INI entry (MERCS_RANDOM_STATS)
if ((gGameExternalOptions.ubMercRandomStats == 1) || (gGameExternalOptions.ubMercRandomStats == 2 && gRandomStatsValue[cnt].Enabled))
randomStatsEnabled = TRUE;
if ( randomStatsEnabled == TRUE )
if (gGameExternalOptions.fMercRandomStats == TRUE && gRandomStatsValue[cnt].Enabled)
{
bBaseAttribute = gRandomStatsValue[cnt].BaseAttribute + ( 4 * gRandomStatsValue[cnt].ExpLevel );
pProfile = &(gMercProfiles[cnt]);