From 392b9b306b6d64ed76dc187e90e4f2597fd3c5c5 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Fri, 6 Dec 2013 18:02:46 +0000
Subject: [PATCH] Updated Merc Random Stats Feature (Jenilee) - randomized gear
 kits are now an ini setting: MERCS_RANDOM_GEAR_KITS = TRUE/FALSE. I made the
 gear randomization optional because it seems to cause trouble for people that
 don't use AIMNAS. SO hopefully this still lets them enjoy the random merc
 feature!

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1890 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/Ja2_Options.INI |  16 ++++++++++------
 Data/Ja2_Options.INI      |  16 ++++++++++------
 INIEditorJA2Options.xml   | Bin 882614 -> 883600 bytes
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI
index c564b3abe..6b5907fd4 100644
--- a/Data-1.13/Ja2_Options.INI
+++ b/Data-1.13/Ja2_Options.INI
@@ -369,6 +369,9 @@ SHOW_SKILLS_IN_HIRING_PAGE = FALSE
 ;     hardcoded formula for 3 is BaseAttribute + 4 * EXP + Random(9) + Random(8)
 ; 4 = full randomization of mercs, including traits, gear kits and all statistics
 ;
+; MERCS_RANDOM_GEAR_KITS: This option only takes effect, if MERCS_RANDOM_STATS = 4
+;                         Set this option to TRUE, so mercs (AIM and MERC) get random gear kits, otherwise they have their original kits.
+;                         
 ; MERCS_RANDOM_BELL_DISTRIBUTION random values use bell-curve distribution if 'TRUE'; 'FALSE', use uniform distribution
 ;
 ; MERCS_RANDOM_STAT_RANGE applicable if MERCS_RANDOM_STATS = 1-2.
@@ -388,18 +391,19 @@ SHOW_SKILLS_IN_HIRING_PAGE = FALSE
 ; Exp = 1/9 will not random
 ;------------------------------------------------------------------------------------------------------------------------------
 
-MERCS_RANDOM_STATS		= 0
-MERCS_RANDOM_BELL_DISTRIBUTION		= TRUE
-MERCS_RANDOM_STAT_RANGE		= 10
-MERCS_RANDOM_EXP_RANGE		= 1
+MERCS_RANDOM_STATS = 0
+MERCS_RANDOM_GEAR_KITS = TRUE
+MERCS_RANDOM_BELL_DISTRIBUTION = TRUE
+MERCS_RANDOM_STAT_RANGE = 10
+MERCS_RANDOM_EXP_RANGE = 1
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; 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_PERCENTAGE_MAX_MODIFIER		= 30
+MERCS_RANDOM_START_SALARY = TRUE
+MERCS_RANDOM_START_SALARY_PERCENTAGE_MAX_MODIFIER = 30
 
 
 ;******************************************************************************************************************************
diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI
index 4627120c9..bf47039e4 100644
--- a/Data/Ja2_Options.INI
+++ b/Data/Ja2_Options.INI
@@ -367,6 +367,9 @@ SHOW_SKILLS_IN_HIRING_PAGE = FALSE
 ;     hardcoded formula for 3 is BaseAttribute + 4 * EXP + Random(9) + Random(8)
 ; 4 = full randomization of mercs, including traits, gear kits and all statistics
 ;
+; MERCS_RANDOM_GEAR_KITS: This option only takes effect, if MERCS_RANDOM_STATS = 4
+;                         Set this option to TRUE, so mercs (AIM and MERC) get random gear kits, otherwise they have their original kits.
+;
 ; MERCS_RANDOM_BELL_DISTRIBUTION random values use bell-curve distribution if 'TRUE'; 'FALSE', use uniform distribution
 ;
 ; MERCS_RANDOM_STAT_RANGE applicable if MERCS_RANDOM_STATS = 1-2.
@@ -387,18 +390,19 @@ SHOW_SKILLS_IN_HIRING_PAGE = FALSE
 ;
 ;------------------------------------------------------------------------------------------------------------------------------
 
-MERCS_RANDOM_STATS		= 0
-MERCS_RANDOM_BELL_DISTRIBUTION		= TRUE
-MERCS_RANDOM_STAT_RANGE		= 10
-MERCS_RANDOM_EXP_RANGE		= 1
+MERCS_RANDOM_STATS = 0
+MERCS_RANDOM_GEAR_KITS = FALSE
+MERCS_RANDOM_BELL_DISTRIBUTION = TRUE
+MERCS_RANDOM_STAT_RANGE = 10
+MERCS_RANDOM_EXP_RANGE = 1
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; 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_PERCENTAGE_MAX_MODIFIER		= 30
+MERCS_RANDOM_START_SALARY = FALSE
+MERCS_RANDOM_START_SALARY_PERCENTAGE_MAX_MODIFIER = 30
 
 
 ;******************************************************************************************************************************
diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml
index ea0aebbbae1a462cab8c6c91253b63e8828ca4d5..73812d4b576a2a62e6adadb0cbd4d60ab0975090 100644
GIT binary patch
delta 271
zcmdn?-gLru(}pdK0wLV)46Y203_%R>4BpcNkFz#T|KPzEHCf;h*K`L@7QX3U6nVs^
ze>ls-!>Yrez>qopek!Bt^a~M;T<j(cdJMb_T+;&`*@dV3m9X$kU)RsfF<mN@kw>_g
zAs?tZmm!s*h#{Gw7|7O`&hO1Asi_HMrUQjbfOHW<B10ZS3Q%b-R5TGNrofQRkjYRo
zxjRmJ`hx2mY}0@BaPmzHU}a;>oE*z9&Iy(U8mTw=qp<Y$52d^wjML*zGO0|z;KL}@
qE)c>9#7scU48$xz%nHP8K+F!r96-zo#9Tnk4a7X#1wwe2DFXnw5=dnL

delta 65
zcmbR6-E`Y~(}pdK0wL|M!Wn^>35c12m<5PgftU@5*@2h?h&h3n3y8Uam}mQ|aNcFg
E0O*k&tN;K2