From 4ab75f5402905f878d270c3a7a22f977c336a3a4 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 26 Jun 2013 07:29:20 +0000 Subject: [PATCH] - Removed unused TONY_USES_BOBBY_RAYS_SETTING and DEVIN_USES_BOBBY_RAYS_SETTING options from Ja2_Options.INI (by silversurfer) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1686 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/Ja2_Options.INI | 14 +++----------- Data-UB/Ja2_Options.ini | 14 +++----------- Data/Ja2_Options.INI | 14 +++----------- INIEditorJA2Options.xml | Bin 842614 -> 841854 bytes 4 files changed, 9 insertions(+), 33 deletions(-) diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index 11e5256e2..0793e2137 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/Data-1.13/Ja2_Options.INI @@ -3181,28 +3181,20 @@ MILITIA_USE_SECTOR_EQUIPMENT_CLASS_SPECIFIC_TABOOS = FALSE ;****************************************************************************************************************************** ; These settings control the inventory of Arulco's resident shopkeepers. +; See also: TableData\NPCInventory\Merchants.xml (eg: useBRSetting) ;****************************************************************************************************************************** -;------------------------------------------------------------------------------------------------------------------------------ -; TONY_USES_BR_SETTING - Tony uses Bobby Ray's setting (makes his inventory better) -; DEVIN_USES_BR_SETTING - Devin uses Bobby Ray's setting (makes his inventory better) -;------------------------------------------------------------------------------------------------------------------------------ - -TONY_USES_BOBBY_RAYS_SETTING = TRUE -DEVIN_USES_BOBBY_RAYS_SETTING = TRUE - ;------------------------------------------------------------------------------------------------------------------------------ ; This is a chance that Tony will be available at his weapon shop in San Mona. (If the chance does not roll, he will be away ; for some time.) Value 80 is vanilla settings, 100 means Tony will always be home. - +;------------------------------------------------------------------------------------------------------------------------------ CHANCE_TONY_AVAILABLE = 80 ;------------------------------------------------------------------------------------------------------------------------------ ; Turn on to get BR shipments faster - +;------------------------------------------------------------------------------------------------------------------------------ FAST_BOBBY_RAY_SHIPMENTS = FALSE - ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/Data-UB/Ja2_Options.ini b/Data-UB/Ja2_Options.ini index b2175ea12..efd0602f1 100644 --- a/Data-UB/Ja2_Options.ini +++ b/Data-UB/Ja2_Options.ini @@ -3183,28 +3183,20 @@ MILITIA_USE_SECTOR_EQUIPMENT_CLASS_SPECIFIC_TABOOS = FALSE ;****************************************************************************************************************************** ; These settings control the inventory of Arulco's resident shopkeepers. +; See also: TableData\NPCInventory\Merchants.xml (eg: useBRSetting) ;****************************************************************************************************************************** -;------------------------------------------------------------------------------------------------------------------------------ -; TONY_USES_BR_SETTING - Tony uses Bobby Ray's setting (makes his inventory better) -; DEVIN_USES_BR_SETTING - Devin uses Bobby Ray's setting (makes his inventory better) -;------------------------------------------------------------------------------------------------------------------------------ - -TONY_USES_BOBBY_RAYS_SETTING = TRUE -DEVIN_USES_BOBBY_RAYS_SETTING = TRUE - ;------------------------------------------------------------------------------------------------------------------------------ ; This is a chance that Tony will be available at his weapon shop in San Mona. (If the chance does not roll, he will be away ; for some time.) Value 80 is vanilla settings, 100 means Tony will always be home. - +;------------------------------------------------------------------------------------------------------------------------------ CHANCE_TONY_AVAILABLE = 80 ;------------------------------------------------------------------------------------------------------------------------------ ; Turn on to get BR shipments faster - +;------------------------------------------------------------------------------------------------------------------------------ FAST_BOBBY_RAY_SHIPMENTS = FALSE - ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI index 84183d148..ae2f5adfb 100644 --- a/Data/Ja2_Options.INI +++ b/Data/Ja2_Options.INI @@ -2979,28 +2979,20 @@ VETERAN_MILITIA_EQUIPMENT_QUALITY_MODIFIER = 0 ;****************************************************************************************************************************** ; These settings control the inventory of Arulco's resident shopkeepers. +; See also: TableData\NPCInventory\Merchants.xml (eg: useBRSetting) ;****************************************************************************************************************************** -;------------------------------------------------------------------------------------------------------------------------------ -; TONY_USES_BR_SETTING - Tony uses Bobby Ray's setting (makes his inventory better) -; DEVIN_USES_BR_SETTING - Devin uses Bobby Ray's setting (makes his inventory better) -;------------------------------------------------------------------------------------------------------------------------------ - -TONY_USES_BOBBY_RAYS_SETTING = FALSE -DEVIN_USES_BOBBY_RAYS_SETTING = FALSE - ;------------------------------------------------------------------------------------------------------------------------------ ; This is a chance that Tony will be available at his weapon shop in San Mona. (If the chance does not roll, he will be away ; for some time.) Value 80 is vanilla settings, 100 means Tony will always be home. - +;------------------------------------------------------------------------------------------------------------------------------ CHANCE_TONY_AVAILABLE = 80 ;------------------------------------------------------------------------------------------------------------------------------ ; Turn on to get BR shipments faster - +;------------------------------------------------------------------------------------------------------------------------------ FAST_BOBBY_RAY_SHIPMENTS = FALSE - ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml index 0a4456f83917dc798746f32c2c73c63662c53eea..6a56a0318b47a3e72f6efcd45d01b5921249d3d9 100644 GIT binary patch delta 458 zcmXw$PcH*e6vglK&9qfh8KD(Kl#p2Y*A*Lzg*IhGEhSAcSkOwRgv5fTsfDDQF7CIG zS)h?viCEc-1%fY7iFDaGZxWfD%$;}d`<-{*G;X6!Cwf*=N}g*`Hre@9jP?|zX@OSB zq!m;#N^;Dny@&r042mJOWy0{ef^zeN`1h^^uULOAyDp%sd8=Rpa1+X_l zdve>N8sg-)VzBcr)c!1%6KGE2y-OK7A`8_%ur?KFj6c3a$VFGxy3uz?S=u7klnyYx z0i;EPG%79lv!M-eWmDDJxYRniIN=FT{ZB_gll%hcl6*+pcp~6gu4mruTQ1MW#Ax-r zqqpX~>T621em8VcHU*?Y8svq1kRNJ+0=2T)`taN(gQh@~88Tqm$T3Y3{`t{D<}&VZ zp5m~SA+s>dA<7A@(-OY(wCNsDuEU;=aS40CjG(t8Avm&)dJca>S`;{as>gWtNqOYi RKK+V&iY;xm>tX%j<_}lZczFN- delta 574 zcmeyj!T8%Y8ftUk`If0mK`@UfALuaPv#BrKT zcR0p)WSSDsI>8VIe+EB>NQQWZP=;UzSBBu}f$BV>oWVc=5I1Cctr+WFpsIX^JcddJ z1%^_FVun0d>G73Z;?sj#IK?!r zfg