From 6c85178ef6f4e5b4dff6b001b9a166a11bc331fc Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 16 Dec 2013 09:22:48 +0000 Subject: [PATCH] New options in ja2_options.ini (by Sevenfm) 1) PLAYER_HIT_COUNT = 0 This works as ENEMY_HIT_COUNT option, but for player mercs. Possible values: 0 - 4 2) SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION_INFO = TRUE Show additional info in tactical tooltip: - APs lost due to suppression - Suppression Tolerance - Effective Shock Level ( Shock level modified by traits and backgrounds. This value is compared with current suppression tolerance to determine "cowering" effect ) - AI morale level 3) SHOW_ENEMY_WEAPON = TRUE Show enemy weapon name above soldier - after health, name and rank. You can see exact weapon name only on short distances, range calculation is similar to dynamic tooltips and based on soldiers actual viewing range and experience. git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1893 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 11 ++++++++++- gamedir/Data/Ja2_Options.INI | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index d07430a61..e5cc6714b 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -822,7 +822,7 @@ HIDE_ENEMY_HEALTH_TEXT = FALSE SHOW_HEALTHBARSOVERHEAD = TRUE ;------------------------------------------------------------------------------------------------------------------------------ -; How should the game display the enemy hit counter? +; How should the game display the enemy/player hit counter? ; 0 = Show damage inflicted as used to ; 1 = Show "?" as indicator if you scored a hit ; 2 = Do not show anything at all (If you scored a hit you need to tell by target's reaction) @@ -832,6 +832,8 @@ SHOW_HEALTHBARSOVERHEAD = TRUE ENEMY_HIT_COUNT = 0 +PLAYER_HIT_COUNT = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; Show additional suppression information above soldier: ; light gray counter - suppression points from attack (they are calculated and shown after attack) @@ -1387,6 +1389,7 @@ SOLDIER_TOOLTIP_DISPLAY_ENERGY = FALSE SOLDIER_TOOLTIP_DISPLAY_MORALE = TRUE SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION = TRUE SOLDIER_TOOLTIP_DISPLAY_SHOCK = TRUE +SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION_INFO= FALSE SOLDIER_TOOLTIP_DISPLAY_TRAITS = TRUE ; Armor, Headgear SOLDIER_TOOLTIP_DISPLAY_HELMET = TRUE @@ -1747,6 +1750,12 @@ CAN_JUMP_THROUGH_CLOSED_WINDOWS = TRUE CAN_CLIMB_ON_WALLS = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; Show enemy weapon name in tactical +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_ENEMY_WEAPON = 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 8cf7df5e1..2bb9b47d6 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -821,7 +821,7 @@ HIDE_ENEMY_HEALTH_TEXT = FALSE SHOW_HEALTHBARSOVERHEAD = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; How should the game display the enemy hit counter? +; How should the game display the enemy/player hit counter? ; 0 = Show damage inflicted as used to ; 1 = Show "?" as indicator if you scored a hit ; 2 = Do not show anything at all (If you scored a hit you need to tell by target's reaction) @@ -831,6 +831,8 @@ SHOW_HEALTHBARSOVERHEAD = FALSE ENEMY_HIT_COUNT = 0 +PLAYER_HIT_COUNT = 0 + ;------------------------------------------------------------------------------------------------------------------------------ ; Show additional suppression information above soldier: ; light gray counter - suppression points from attack (they are calculated and shown after attack) @@ -1386,6 +1388,7 @@ SOLDIER_TOOLTIP_DISPLAY_ENERGY = FALSE SOLDIER_TOOLTIP_DISPLAY_MORALE = TRUE SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION = FALSE SOLDIER_TOOLTIP_DISPLAY_SHOCK = FALSE +SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION_INFO= FALSE SOLDIER_TOOLTIP_DISPLAY_TRAITS = FALSE ; Armor, Headgear SOLDIER_TOOLTIP_DISPLAY_HELMET = FALSE @@ -1746,6 +1749,12 @@ CAN_JUMP_THROUGH_CLOSED_WINDOWS = FALSE CAN_CLIMB_ON_WALLS = FALSE +;------------------------------------------------------------------------------------------------------------------------------ +; Show enemy weapon name in tactical +;------------------------------------------------------------------------------------------------------------------------------ + +SHOW_ENEMY_WEAPON = FALSE + ;------------------------------------------------------------------------------------------------------------------------------ ; Turn this on, and you can set hidden names individually in 'TableData\HiddenNames.xml'. ;------------------------------------------------------------------------------------------------------------------------------