From ff01234c8cda711fe1fd1da0050720bcfef5e580 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Mon, 17 Mar 2014 14:27:03 +0000 Subject: [PATCH] put back ini options COVER_SYSTEM_ALTERNATE_MULTI_TERRAIN_CAMO_CALCULATION and COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES which somehow got lost during a merge typo correction for ENEMY_MEDICS_SEARCHRADIUS git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1991 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 13 +++++++++++-- gamedir/Data/Ja2_Options.INI | 17 ++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 4240c849c..3e9ef4e11 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -2045,9 +2045,9 @@ ENEMY_MEDICS = TRUE ; 0.1 means drain is only 10%. Default 0.1, values between 0.01 and 1.0. ENEMY_MEDICS_MEDKITDRAINFACTOR = 0.1 -; radius in which a medic searches for patients. Targets farer away are ignored. It is required that the medic sees the patient +; radius in which a medic searches for patients. Targets farther away are ignored. It is required that the medic sees the patient ; Default 20, values between 5 and 60. -ENEMY_MEDICS_SEARCHRAIUS = 20 +ENEMY_MEDICS_SEARCHRADIUS = 20 ; allow AI officers for the AI team. An officer is a soldier with the squadleader trait. There are two stages of this: ; a officer with squadleader trait is considered a lieutnant, an officer with squadleader(expert) is a captain. @@ -2121,6 +2121,15 @@ COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = TRUE ; Static shadows decrease brightness COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS = TRUE +; Camo affinities will be used as caps not multipliers (suggested by mmm). +; It will be possible to achieve perfect camo on mixed terrain using mixed camo types. +; Works only if COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = TRUE. +COVER_SYSTEM_ALTERNATE_MULTI_TERRAIN_CAMO_CALCULATION = TRUE + +; Cover tooltip ("f") will display detailed properties and their values. +; Works only if COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = TRUE. +COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES = TRUE + ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 01709af60..f18e915d3 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -2040,6 +2040,14 @@ COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = FALSE ; Static shadows decrease brightness COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS = FALSE +; Camo affinities will be used as caps not multipliers (suggested by mmm). +; It will be possible to achieve perfect camo on mixed terrain using mixed camo types. +; Works only if COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = TRUE. +COVER_SYSTEM_ALTERNATE_MULTI_TERRAIN_CAMO_CALCULATION = TRUE + +; Cover tooltip ("f") will display detailed properties and their values. +; Works only if COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = TRUE. +COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES = TRUE ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -2055,15 +2063,6 @@ COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS = FALSE ; To enable the system, raise the value of "SUPPRESSION_EFFECTIVENESS" above 0. ;****************************************************************************************************************************** -; Camo affinities will be used as caps not multipliers (suggested by mmm). -; It will be possible to achieve perfect camo on mixed terrain using mixed camo types. -; Works only if COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = TRUE. -COVER_SYSTEM_ALTERNATE_MULTI_TERRAIN_CAMO_CALCULATION = TRUE - -; Cover tooltip ("f") will display detailed properties and their values. -; Works only if COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES = TRUE. -COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES = TRUE - ;****************************************************************************************************************************** ; SUPPRESSION BASICS ;