From dcd5956f2472c0b70dc2391d6b89651b39f7b714 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 11 May 2013 16:58:49 +0000 Subject: [PATCH] INI Adjustments (by Buggler) - Added RandomStats & RandomSalary options to INIEditorJA2Options.xml - More detailed description for RandomStats settings - Set faster laptop transition & website loading in Ja2_Options.ini for 1.13 & UB git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1674 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/Ja2_Options.INI | 40 ++++++++++++++++++++++++++------------ Data-UB/Ja2_Options.ini | 40 ++++++++++++++++++++++++++------------ Data/Ja2_Options.INI | 36 ++++++++++++++++++++++++---------- INIEditorJA2Options.xml | Bin 837728 -> 842614 bytes 4 files changed, 82 insertions(+), 34 deletions(-) diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index 8cf04d14e..2781c93ee 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/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/Data-UB/Ja2_Options.ini b/Data-UB/Ja2_Options.ini index 4b0523b7e..332f708f0 100644 --- a/Data-UB/Ja2_Options.ini +++ b/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/Data/Ja2_Options.INI b/Data/Ja2_Options.INI index c4d9f053e..1c682ebb1 100644 --- a/Data/Ja2_Options.INI +++ b/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 diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml index 8f29db43433dcd91956eb994181f752f3b74425e..0a4456f83917dc798746f32c2c73c63662c53eea 100644 GIT binary patch delta 1796 zcma)7OHUI~6h4>I(v~7>DHRAhfFwn&?X)N~#*k`IgO3m-h!KOxv^s`IdH9GMB`(}) z<0xmRF8l#5R2H%!@ejDrxY1zZ%EZXRxHNwE&IpwPn&wPq&bjA1kMG>m#eDMTtK{t$ zqBcJJ(lu`_{-|c{o!H91;^In!Mng1425EGPy6G^rPzP0zpW@IQgcv-di}RJb^O>cq zG(scXkr4H~IU)Rf?|zA=B1e-nPFXTx%Odb_s8ZqO*KjZj`g z%n<-(XiCLOIN&+xCutfeurG(G<=!)aYM#|aEe|Bb<&aD->9|}3j0|e1<9b%*F$!aZ z4gqBfG15SshTbH3cp91(*iBUJq!;36389tm!S^J5#^@5i&AY?17rg#kCyHI<=>1hfqj(P%g9t&m-iPU;5*wysAdVrT##MJ*|n zvpnn=9DV!TOw1J%oPQI@@?uPAJWyF`aQunb$=bJ)fx0y1@Ebw7!$7=Xy=`aT4)_3di9t|JOYX&K*;HCYp{gKcdpMhZ{a^uK*mh^^7Oz75hVN;;l$ zf(S3DD}o6CO}RVyrRbE{F{bCsnTe%d4&t$d${KehUL|HUlQ zb=t#N%xS`5w3BXNuDaD;$$Xy|%TqEnIp_r3f zW7SBkVy+NRawfTUF#m_S?Ug;$OM{r%G@XF-SPft5tP2D4ymZ3nl{>78ZyxXmqEqUc z$#rMqTFEV8?-31inSpi~&oP`)_O%yk^V$ow16UF2LU7rSJ{F-s{T7?2BPy%YxSuUn z@zibKvMP5v%c8+k<30(ueinCp6TJDjOS8J4ms-yv{k-JGpUBsks9M8O_lf!y#~?qr z>)rY&;@%Yed#9)yz-hx>6LMB>!IHsswHBJg*5i!Fg>|!%^4+DRfRsR7kWz>n;(?Sw RybvG64=JBpN(OQde**z z|5|Rz>GKR3J@`Wyf*3-S5HkTWGZ3=?F)I+W0Wmuea{w_X5OV=B_x4rpJZB~Y0M5-alK=n!