From 5a6b9bb8f9b6b5a99fa5e56404b52e0512b19514 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 17 Sep 2006 07:52:28 +0000 Subject: [PATCH] new exe (528): - moved Random personality flag from INI to option screen - added MAX_IMP_CHARACTERS entry in the ja2_options.ini (Range: 0 - 6) - bugfix: Getting incorrect data & CTDs when using multiple IMP characters with same voices. Now it is possible to have up to 6 merc with the same voice without getting incorrect data. No more need to use different voices! (IF YOU PLAY WITH MULTIPLE IMPS, YOU SHOULD START A NEW GAME, BECAUSE THE IMP CHARACTERS GAME DATA IS INCORRECT AND CAUSES CTDs!) - bugfix: CTD when using Random personality in I.M.P creation - bugfix: allow women to be in regular army and administrators - bugfix: CTD bug when stealing (thx to Brent Johnson aka Nonomori) - bugfix: when camouflage has worn off for one merc, it was said that every merc camouflage has worn off (including vehicles) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@500 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 11 ++++------- gamedir/Data/Ja2_Options.INI | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 97e8fb808..da5ffee40 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -452,6 +452,9 @@ MAXIMUM_MILITIA_SQUAD_SIZE = 20 [JA2 Laptop Settings] +; The maximum number of I.M.P. (B.S.E.) characters, the player can have (Range: 0 - 6). +MAX_IMP_CHARACTERS = 6 + ;****************************************************************************************************************************** ; The following values deal with the IMP merc generation, MIN_ATTRIBUTE_POINT is the lowest ; you can lower an attribute, and the lowest you can lower a skill before it hits zero. @@ -486,12 +489,7 @@ ALL_MERCS_AT_MERC = FALSE ; your IMP Mercs. ; ; CUSTOM_PERSONALITY and CUSTOM_ATTITUDE allow you to specify what personality you want for your IMP -; Merc. This option does not work with USE_RANDOM_PERSONALITY, it won't be random at all. Another Note -; before I get on with the valid settings for these two options, The INI file is NOW read at the beginning -; of the game, so if you want to pick and choose your personalities and attitudes AND use multiple IMPS, you -; Will need to save and exit the game, change the settings and then start the game back up to create the next -; IMP. I WILL FIX THIS by creating another IMP Webpage. But for now, this will have to do. -; +; Merc. ; Here are the valid settings for personalities and Attitudes: ; ; PERSONALITIES: @@ -519,7 +517,6 @@ ALL_MERCS_AT_MERC = FALSE ; COWARD = 9 ;****************************************************************************************************************************** -USE_RANDOM_PERSONALITY = FALSE CUSTOM_PERSONALITY = 0 CUSTOM_ATTITUDE = 0 diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 2bda8a715..f1576bbfa 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -452,6 +452,9 @@ MAXIMUM_MILITIA_SQUAD_SIZE = 20 [JA2 Laptop Settings] +; The maximum number of I.M.P. (B.S.E.) characters, the player can have (Range: 0 - 6). +MAX_IMP_CHARACTERS = 1 + ;****************************************************************************************************************************** ; The following values deal with the IMP merc generation, MIN_ATTRIBUTE_POINT is the lowest ; you can lower an attribute, and the lowest you can lower a skill before it hits zero. @@ -486,12 +489,7 @@ ALL_MERCS_AT_MERC = FALSE ; your IMP Mercs. ; ; CUSTOM_PERSONALITY and CUSTOM_ATTITUDE allow you to specify what personality you want for your IMP -; Merc. This option does not work with USE_RANDOM_PERSONALITY, it won't be random at all. Another Note -; before I get on with the valid settings for these two options, The INI file is NOW read at the beginning -; of the game, so if you want to pick and choose your personalities and attitudes AND use multiple IMPS, you -; Will need to save and exit the game, change the settings and then start the game back up to create the next -; IMP. I WILL FIX THIS by creating another IMP Webpage. But for now, this will have to do. -; +; Merc. ; Here are the valid settings for personalities and Attitudes: ; ; PERSONALITIES: @@ -519,7 +517,6 @@ ALL_MERCS_AT_MERC = FALSE ; COWARD = 9 ;****************************************************************************************************************************** -USE_RANDOM_PERSONALITY = FALSE CUSTOM_PERSONALITY = 0 CUSTOM_ATTITUDE = 0