From 0ce71b2b9557e2d5798649d5c564f45300e9ffe2 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 16 Mar 2014 19:35:48 +0000 Subject: [PATCH] Merged from revision: 1989 More visual enemy gear info (by Sevenfm) - Show additional info in NCTH cursor (press ALT) (ADDITIONAL_NCTH_CURSOR_INFO = 2) -> You can only use this feature at certain distance - Updated 'show enemy weapon' feature (SHOW_ENEMY_WEAPON = TRUE, SHOW_ENEMY_EXTENDED_INFO = TRUE) - Now it can show armour and face items, too. Useful for OCTH users (SHOW_ENEMY_AWARENESS = TRUE) - Show total value of damage, absorbed by armour in last attack (SHOW_HIT_INFO = TRUE) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1990 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 26 +++++++++++++++++++------- gamedir/Data/Ja2_Options.INI | 26 +++++++++++++++++++------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index d241f3e18..4240c849c 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -883,6 +883,21 @@ ENEMY_HIT_COUNT = 0 PLAYER_HIT_COUNT = 0 +;------------------------------------------------------------------------------------------------------------------------------ +; Show additional hit info: amount of damage absorbed by armour +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_HIT_INFO = FALSE + +;------------------------------------------------------------------------------------------------------------------------------ +; Show additional info in NCTH cursor (press ALT) +; 0 - default cursor +; 1 - show enemy armour +; 2 - show armour, weapons and head items +;------------------------------------------------------------------------------------------------------------------------------ + +ADDITIONAL_NCTH_CURSOR_INFO = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; Show additional suppression information above soldier: ; light gray counter - suppression points from attack (they are calculated and shown after attack) @@ -1812,20 +1827,17 @@ CAN_JUMP_THROUGH_CLOSED_WINDOWS = TRUE CAN_CLIMB_ON_WALLS = TRUE ;------------------------------------------------------------------------------------------------------------------------------ -; Show enemy weapon name in tactical +; Show enemy weapon name, armour and head items in tactical ;------------------------------------------------------------------------------------------------------------------------------ SHOW_ENEMY_WEAPON = FALSE +SHOW_ENEMY_EXTENDED_INFO = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; Show additional enemy info in tactical (awareness, gas mask, nvg, armour) -; 0 - nothing -; 1 - show awareness level -; 2 - show gas mask and NVG -; 3 - show armour +; Show color coded enemy awareness sign when sneaking or covert ;------------------------------------------------------------------------------------------------------------------------------ -SHOW_ENEMY_ADDITIONAL_INFO = 0 +SHOW_ENEMY_AWARENESS = FALSE ;------------------------------------------------------------------------------------------------------------------------------ ; Turn this on, and you can set hidden names individually in 'TableData\HiddenNames.xml'. diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 5ee060490..01709af60 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -882,6 +882,21 @@ ENEMY_HIT_COUNT = 0 PLAYER_HIT_COUNT = 0 +;------------------------------------------------------------------------------------------------------------------------------ +; Show additional hit info: amount of damage absorbed by armour +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_HIT_INFO = FALSE + +;------------------------------------------------------------------------------------------------------------------------------ +; Show additional info in NCTH cursor (press ALT) +; 0 - default cursor +; 1 - show enemy armour +; 2 - show armour, weapons and head items +;------------------------------------------------------------------------------------------------------------------------------ + +ADDITIONAL_NCTH_CURSOR_INFO = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; Show additional suppression information above soldier: ; light gray counter - suppression points from attack (they are calculated and shown after attack) @@ -1788,20 +1803,17 @@ CAN_JUMP_THROUGH_CLOSED_WINDOWS = FALSE CAN_CLIMB_ON_WALLS = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; Show enemy weapon name in tactical +; Show enemy weapon name, armour and head items in tactical ;------------------------------------------------------------------------------------------------------------------------------ SHOW_ENEMY_WEAPON = FALSE +SHOW_ENEMY_EXTENDED_INFO = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; Show additional enemy info in tactical (awareness, gas mask, nvg, armour) -; 0 - nothing -; 1 - show awareness level -; 2 - show gas mask and NVG -; 3 - show armour +; Show color coded enemy awareness sign when sneaking or covert ;------------------------------------------------------------------------------------------------------------------------------ -SHOW_ENEMY_ADDITIONAL_INFO = 0 +SHOW_ENEMY_AWARENESS = FALSE ;------------------------------------------------------------------------------------------------------------------------------ ; Turn this on, and you can set hidden names individually in 'TableData\HiddenNames.xml'.