diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 11e5256e2..0793e2137 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/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/gamedir/Data-UB/Ja2_Options.ini b/gamedir/Data-UB/Ja2_Options.ini index b2175ea12..efd0602f1 100644 --- a/gamedir/Data-UB/Ja2_Options.ini +++ b/gamedir/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/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 84183d148..ae2f5adfb 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/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 - ;****************************************************************************************************************************** ;******************************************************************************************************************************