From 8503fc26c2e7d1936fc6b67ff001c8d760d3c9f7 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 10 Jan 2014 16:22:25 +0000 Subject: [PATCH] Visual tactical improvements (by Sevenfm) 1) Improved cover indicator: SHOW_COVER_INDICATOR 0 - nothing 1 - show as small square to the right of health bar 2 - show using color of merc's name 3 - same as 1, show only in stealth or when disguised 4 - same as 2, show only in stealth or when disguised 2) Enemy rank (exp. level) icons: SHOW_ENEMY_RANK_ICON 0 - do not show 1 - show icon 2 - show icon from .sti (not yet implemented) 3) Enemy health bar: SHOW_ENEMY_HEALTH 0 - do not show 1 - show health as text (default) 2 - show health bar 3 - show health + ap 4 - show health + ap + shock 5 - show health + ap + shock + morale 6 - show health + ap + shock + morale + bp 4) Minor improvements: Enemy awareness sign now shows up only in stealth/disguised mode. Turned on Extended Disarm Dialog for turnbased (it was implemented but turned off) Recommended settings for regular gameplay (from video example above): INDIVIDUAL_ENEMY_NAMES = FALSE INDIVIDUAL_ENEMY_RANK = FALSE SHOW_ENEMY_RANK_ICON = 1 SHOW_ENEMY_HEALTH = 4 SHOW_COVER_INDICATOR = 2 SHOW_ENEMY_ADDITIONAL_INFO = 1 SHOW_ENEMY_WEAPON = TRUE see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/329674/Re:_Code_Snippets.html#Post329674 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1915 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 28 ++++++++++++++++++++++++++-- gamedir/Data/Ja2_Options.INI | 28 ++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index ea4605a05..1c74667e0 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -824,10 +824,17 @@ TACTICAL_FACE_ICON_STYLE = 0 SHOW_CAMOUFLAGE_FACES = TRUE ;------------------------------------------------------------------------------------------------------------------------------ -; If enabled, you do not see the health text when hovering the mouse over an enemy / creature. +; Show health text when hovering the mouse over an enemy / creature. +; 0 - do not show +; 1 - show health as text +; 2 - show health bar +; 3 - show health + ap +; 4 - show health + ap + shock +; 5 - show health + ap + shock + morale +; 6 - show health + ap + shock + morale + bp ;------------------------------------------------------------------------------------------------------------------------------ -HIDE_ENEMY_HEALTH_TEXT = FALSE +SHOW_ENEMY_HEALTH = 1 ;------------------------------------------------------------------------------------------------------------------------------ ; If enabled, you see the health and fatigue bar when hovering over your mercs, and on the currently selected merc. @@ -842,6 +849,17 @@ HIDE_ENEMY_HEALTH_TEXT = FALSE SHOW_HEALTHBARSOVERHEAD = 1 +;------------------------------------------------------------------------------------------------------------------------------ +; Show current merc's cover using color - GREEN, YELLOW, ORANGE and RED +; 0 - do not show cover +; 1 - show as small square to the right of the health bar +; 2 - show using color of merc's name +; 3 - same as 1, show only in stealth or when disguised +; 4 - same as 2, show only in stealth or when disguised +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_COVER_INDICATOR = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; How should the game display the enemy/player hit counter? ; 0 = Show damage inflicted as used to @@ -1806,6 +1824,12 @@ INDIVIDUAL_ENEMY_NAMES = FALSE INDIVIDUAL_ENEMY_RANK = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; Show enemy rank (exp. level) as icon +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_ENEMY_RANK_ICON = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; Turn this on, and the game uses individual civilian group names (in tactical) defined in 'TableData\CivGroupNames.xml'. ;------------------------------------------------------------------------------------------------------------------------------ diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 7207ac98e..42d764494 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -822,10 +822,17 @@ TACTICAL_FACE_ICON_STYLE = 0 SHOW_CAMOUFLAGE_FACES = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; If enabled, you do not see the health text when hovering the mouse over an enemy / creature. +; Show health text when hovering the mouse over an enemy / creature. +; 0 - do not show +; 1 - show health as text +; 2 - show health bar +; 3 - show health + ap +; 4 - show health + ap + shock +; 5 - show health + ap + shock + morale +; 6 - show health + ap + shock + morale + bp ;------------------------------------------------------------------------------------------------------------------------------ -HIDE_ENEMY_HEALTH_TEXT = FALSE +SHOW_ENEMY_HEALTH = 1 ;------------------------------------------------------------------------------------------------------------------------------ ; If enabled, you see the health and fatigue bar when hovering over your mercs, and on the currently selected merc. @@ -840,6 +847,17 @@ HIDE_ENEMY_HEALTH_TEXT = FALSE SHOW_HEALTHBARSOVERHEAD = 0 +;------------------------------------------------------------------------------------------------------------------------------ +; Show current merc's cover using color - GREEN, YELLOW, ORANGE and RED +; 0 - do not show cover +; 1 - show as small square to the right of the health bar +; 2 - show using color of merc's name +; 3 - same as 1, show only in stealth or when disguised +; 4 - same as 2, show only in stealth or when disguised +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_COVER_INDICATOR = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; How should the game display the enemy/player hit counter? @@ -1805,6 +1823,12 @@ INDIVIDUAL_ENEMY_NAMES = FALSE INDIVIDUAL_ENEMY_RANK = FALSE +;------------------------------------------------------------------------------------------------------------------------------ +; Show enemy rank (exp. level) as icon +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_ENEMY_RANK_ICON = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; Turn this on, and the game uses individual civilian group names (in tactical) defined in 'TableData\CivGroupNames.xml'. ;------------------------------------------------------------------------------------------------------------------------------