diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 8cf04d14e..2781c93ee 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -327,24 +327,40 @@ EARLY_REBELS_RECRUITMENT = 3 SHOW_SKILLS_IN_HIRING_PAGE = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; Should the game use random stats for the mercenaries (AIM, MERC, RPC, EPC & NPC)? -; 0 = Do not use random stats (JA2 vanilla setting) -; 1 = Full Random for all profiles -; 2 = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml" -; 3 = Build random stats from (BaseAttribute) in "TableData\RandomStats.xml", range determined by level -; Valid +/- random range for stats (0-50), for EXP (0-4) +; Should the game use random stats for the mercenaries (AIM, MERC, RPC, EPC and NPC)? +; 0 = do not use random stats (JA2 vanilla setting) +; 1 = full random stats for all profiles based on their "TableData\MercProfiles.xml" values +; 2 = partial random stats for any mercs that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml" +; 3 = build random stats from (BaseAttribute) in "TableData\RandomStats.xml", range determined by level +; Hardcoded formula for 3 is BaseAttribute + 4 * EXP + Random(9) + Random(8) +; +; MERCS_RANDOM_STAT_RANGE applicable if MERCS_RANDOM_STATS = 1-2. +; Valid +/- range (0-50) +; For example MERCS_RANDOM_STAT_RANGE = 10, +; Stat = 80 will random between 70-90 +; Stat = 95 will random between 90-100 due to 100 maximum limit +; Stat = 5 will random between 1-9 due to 1 minimum limit +; Stat = 0/1/100 will not random +; +; MERCS_RANDOM_EXP_RANGE applicable if MERCS_RANDOM_STATS = 1-3. +; Valid +/- range (0-4) +; For example MERCS_RANDOM_EXP_RANGE = 2, +; Exp = 4 will random between 2-6 +; Exp = 8 will random between 7-9 due to 9 maximum limit +; Exp = 2 will random between 1-3 due to 1 minimum limit +; Exp = 1/9 will will not random ;------------------------------------------------------------------------------------------------------------------------------ -MERCS_RANDOM_STATS = 0 +MERCS_RANDOM_STATS = 1 MERCS_RANDOM_STAT_RANGE = 10 MERCS_RANDOM_EXP_RANGE = 1 ;------------------------------------------------------------------------------------------------------------------------------ -; Use random starting salaries for mercenaries (JA2 vanilla setting = FALSE) -; MAX_MODIFIER is the allowed +/- random percentage range (0-100, default = 30) +; Use random starting salaries for mercenaries based on their "TableData\MercProfiles.xml" values? (JA2 Vanilla setting = FALSE) +; If MERCS_RANDOM_START_SALARY set TRUE, MAX_MODIFIER is the allowed +/- random percentage range (0-100, default = 30) ;------------------------------------------------------------------------------------------------------------------------------ -MERCS_RANDOM_START_SALARY = TRUE +MERCS_RANDOM_START_SALARY = TRUE MERCS_RANDOM_START_SALARY_PERCENTAGE_MAX_MODIFIER = 30 @@ -2574,10 +2590,10 @@ BRIEFING_ROOM = FALSE ENCYCLOPEDIA = FALSE ; If disabled, the transition will be skipped when opening/closing the laptop -DISABLE_LAPTOP_TRANSITION = FALSE +DISABLE_LAPTOP_TRANSITION = TRUE ; Fast loading of WWW laptop sites? -FAST_WWW_SITES_LOADING = FALSE +FAST_WWW_SITES_LOADING = TRUE ; If set to TRUE, mouse boundary will be locked on the laptop, default behaviour. Ctrl + Z / Ctrl + Y to toggle current laptop session only LAPTOP_MOUSE_CAPTURED = FALSE diff --git a/gamedir/Data-UB/Ja2_Options.ini b/gamedir/Data-UB/Ja2_Options.ini index 4b0523b7e..332f708f0 100644 --- a/gamedir/Data-UB/Ja2_Options.ini +++ b/gamedir/Data-UB/Ja2_Options.ini @@ -329,24 +329,40 @@ EARLY_REBELS_RECRUITMENT = 3 SHOW_SKILLS_IN_HIRING_PAGE = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; Should the game use random stats for the mercenaries (AIM, MERC, RPC, EPC & NPC)? -; 0 = Do not use random stats (JA2 vanilla setting) -; 1 = Full Random for all profiles -; 2 = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml" -; 3 = Build random stats from (BaseAttribute) in "TableData\RandomStats.xml", range determined by level -; Valid +/- random range for stats (0-50), for EXP (0-4) +; Should the game use random stats for the mercenaries (AIM, MERC, RPC, EPC and NPC)? +; 0 = do not use random stats (JA2 vanilla setting) +; 1 = full random stats for all profiles based on their "TableData\MercProfiles.xml" values +; 2 = partial random stats for any mercs that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml" +; 3 = build random stats from (BaseAttribute) in "TableData\RandomStats.xml", range determined by level +; Hardcoded formula for 3 is BaseAttribute + 4 * EXP + Random(9) + Random(8) +; +; MERCS_RANDOM_STAT_RANGE applicable if MERCS_RANDOM_STATS = 1-2. +; Valid +/- range (0-50) +; For example MERCS_RANDOM_STAT_RANGE = 10, +; Stat = 80 will random between 70-90 +; Stat = 95 will random between 90-100 due to 100 maximum limit +; Stat = 5 will random between 1-9 due to 1 minimum limit +; Stat = 0/1/100 will not random +; +; MERCS_RANDOM_EXP_RANGE applicable if MERCS_RANDOM_STATS = 1-3. +; Valid +/- range (0-4) +; For example MERCS_RANDOM_EXP_RANGE = 2, +; Exp = 4 will random between 2-6 +; Exp = 8 will random between 7-9 due to 9 maximum limit +; Exp = 2 will random between 1-3 due to 1 minimum limit +; Exp = 1/9 will will not random ;------------------------------------------------------------------------------------------------------------------------------ -MERCS_RANDOM_STATS = 0 +MERCS_RANDOM_STATS = 1 MERCS_RANDOM_STAT_RANGE = 10 MERCS_RANDOM_EXP_RANGE = 1 ;------------------------------------------------------------------------------------------------------------------------------ -; Use random starting salaries for mercenaries (JA2 vanilla setting = FALSE) -; MAX_MODIFIER is the allowed +/- random percentage range (0-100, default = 30) +; Use random starting salaries for mercenaries based on their "TableData\MercProfiles.xml" values? (JA2 Vanilla setting = FALSE) +; If MERCS_RANDOM_START_SALARY set TRUE, MAX_MODIFIER is the allowed +/- random percentage range (0-100, default = 30) ;------------------------------------------------------------------------------------------------------------------------------ -MERCS_RANDOM_START_SALARY = FALSE +MERCS_RANDOM_START_SALARY = TRUE MERCS_RANDOM_START_SALARY_PERCENTAGE_MAX_MODIFIER = 30 @@ -2532,10 +2548,10 @@ BRIEFING_ROOM = FALSE ENCYCLOPEDIA = FALSE ; If disabled, the transition will be skipped when opening/closing the laptop -DISABLE_LAPTOP_TRANSITION = FALSE +DISABLE_LAPTOP_TRANSITION = TRUE ; Fast loading of WWW laptop sites? -FAST_WWW_SITES_LOADING = FALSE +FAST_WWW_SITES_LOADING = TRUE ; If set to TRUE, mouse boundary will be locked on the laptop, default behaviour. Ctrl + Z / Ctrl + Y to toggle current laptop session only LAPTOP_MOUSE_CAPTURED = FALSE diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index c4d9f053e..1c682ebb1 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -327,24 +327,40 @@ EARLY_REBELS_RECRUITMENT = 3 SHOW_SKILLS_IN_HIRING_PAGE = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; Should the game use random stats for the mercenaries (AIM, MERC, RPC, EPC & NPC)? -; 0 = Do not use random stats (JA2 vanilla setting) -; 1 = Full Random for all profiles -; 2 = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml" -; 3 = Build random stats from (BaseAttribute) in "TableData\RandomStats.xml", range determined by level -; Valid +/- random range for stats (0-50), for EXP (0-4) +; Should the game use random stats for the mercenaries (AIM, MERC, RPC, EPC and NPC)? +; 0 = do not use random stats (JA2 vanilla setting) +; 1 = full random stats for all profiles based on their "TableData\MercProfiles.xml" values +; 2 = partial random stats for any mercs that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml" +; 3 = build random stats from (BaseAttribute) in "TableData\RandomStats.xml", range determined by level +; Hardcoded formula for 3 is BaseAttribute + 4 * EXP + Random(9) + Random(8) +; +; MERCS_RANDOM_STAT_RANGE applicable if MERCS_RANDOM_STATS = 1-2. +; Valid +/- range (0-50) +; For example MERCS_RANDOM_STAT_RANGE = 10, +; Stat = 80 will random between 70-90 +; Stat = 95 will random between 90-100 due to 100 maximum limit +; Stat = 5 will random between 1-9 due to 1 minimum limit +; Stat = 0/1/100 will not random +; +; MERCS_RANDOM_EXP_RANGE applicable if MERCS_RANDOM_STATS = 1-3. +; Valid +/- range (0-4) +; For example MERCS_RANDOM_EXP_RANGE = 2, +; Exp = 4 will random between 2-6 +; Exp = 8 will random between 7-9 due to 9 maximum limit +; Exp = 2 will random between 1-3 due to 1 minimum limit +; Exp = 1/9 will will not random ;------------------------------------------------------------------------------------------------------------------------------ -MERCS_RANDOM_STATS = 0 +MERCS_RANDOM_STATS = 0 MERCS_RANDOM_STAT_RANGE = 10 MERCS_RANDOM_EXP_RANGE = 1 ;------------------------------------------------------------------------------------------------------------------------------ -; Use random starting salaries for mercenaries (JA2 vanilla setting = FALSE) -; MAX_MODIFIER is the allowed +/- random percentage range (0-100, default = 30) +; Use random starting salaries for mercenaries based on their "TableData\MercProfiles.xml" values? (JA2 Vanilla setting = FALSE) +; If MERCS_RANDOM_START_SALARY set TRUE, MAX_MODIFIER is the allowed +/- random percentage range (0-100, default = 30) ;------------------------------------------------------------------------------------------------------------------------------ -MERCS_RANDOM_START_SALARY = FALSE +MERCS_RANDOM_START_SALARY = FALSE MERCS_RANDOM_START_SALARY_PERCENTAGE_MAX_MODIFIER = 30