Merged from revision: 1996

Minor fixes/improvements for existing features (by Sevenfm)
- Removed some unnecessary options for SHOW_HEALTHBARSOVERHEAD, SHOW_COVER_INDICATOR.
- New option: ENEMY_CLOCK_SPEED_PERCENT - set clock speed during enemy turns.
With this option, player can set default speed to comfortable value (100-120) and set increased speed for enemy turns (150-200).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1997 4f8fa57e-7814-0410-bad4-adc449f26b7c

gamedir/Data-1.13/Ja2_Options.INI

@@ -851,10 +851,8 @@ SHOW_ENEMY_HEALTH = 1
 ; Alt health bar additionally shows suppression shock level and current cover
 ; 0 - nothing
 ; 1 - default health bar
-; 2 - smaller alt health bar
+; 2 - alt health bar
-; 3 - larger alt health bar
+; 3 - alt health bar + AP counter
-; 4 - small health bar + AP counter
-; 5 - large health bar + AP counter
 ;------------------------------------------------------------------------------------------------------------------------------
 
 SHOW_HEALTHBARSOVERHEAD  = 1
@@ -862,10 +860,8 @@ 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
+; 1 - show using color of merc's name
-; 2 - show using color of merc's name
+; 2 - same as 1, show only in stealth or when disguised
-; 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
@@ -3888,6 +3884,13 @@ USE_XML_SQUADNAMES = FALSE
 
 CLOCK_SPEED_PERCENT = 150
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Clock speed percent during enemy turns
+; Range: 100 - 300   Default: 150
+;------------------------------------------------------------------------------------------------------------------------------
+
+ENEMY_CLOCK_SPEED_PERCENT = 150
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Timeslice in microseconds. The frequency that the screen is refreshed.
 ; At normal speed the clock is updated every 16 milliseconds. 

gamedir/Data/Ja2_Options.INI

@@ -849,10 +849,8 @@ SHOW_ENEMY_HEALTH = 1
 ; Alt health bar additionally shows suppression shock level and current cover
 ; 0 - nothing
 ; 1 - default health bar
-; 2 - smaller alt health bar
+; 2 - alt health bar
-; 3 - larger alt health bar
+; 3 - alt health bar + AP counter
-; 4 - small health bar + AP counter
-; 5 - large health bar + AP counter
 ;------------------------------------------------------------------------------------------------------------------------------
 
 SHOW_HEALTHBARSOVERHEAD  = 0
@@ -860,10 +858,8 @@ 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
+; 1 - show using color of merc's name
-; 2 - show using color of merc's name
+; 2 - same as 1, show only in stealth or when disguised
-; 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
@@ -3783,6 +3779,14 @@ USE_XML_SQUADNAMES = FALSE
 
 CLOCK_SPEED_PERCENT = 150
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Clock speed percent during enemy turns
+; Range: 100 - 300   Default: 150
+;------------------------------------------------------------------------------------------------------------------------------
+
+ENEMY_CLOCK_SPEED_PERCENT = 150
+
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Timeslice in microseconds. The frequency that the screen is refreshed.
 ; At normal speed the clock is updated every 16 milliseconds.