Merged from revision: 1920

Fixes (by Buggler)
- removed IMPROVED_BOMB_PLANTING option, enabled by default
- removed AIMED_BURST_ALTERNATE_KEY option, enabled by default. Alternate Aiming Hotkey reassigned to ',' (comma) for increasing aim

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

gamedir/Data-1.13/Ja2_Options.INI

@@ -931,14 +931,13 @@ ALT_AIMING_ENABLED = TRUE
 ; Default: FALSE
 ; The merc can now perform aimed burst fire and aimed auto fire.
 ; Due to the reworked auto and burst penalties aimed auto-fire is less efficient then aimed burst for all guns. There is simply
-; no use in firing more then 3 rounds due to low CtH od the last bullets. Aiming is performed by the mouse scrolling wheel. 
+; no use in firing more then 3 rounds due to low CtH for the last bullets. Aiming is performed by the mouse scrolling wheel. 
 ; ENABLE_EXT_MOUSE_KEYS must be set to TRUE for this option.
 ;
-; If your mousewheel does not work, you can do the same via [o] if AIMED_BURST_ALTERNATE_KEY is TRUE.
+; If mousewheel does not work for aiming, alternative method via [,] (comma) to increase aim; [ALT + ,] to decrease aim.
 ;------------------------------------------------------------------------------------------------------------------------------
 
 USE_AIMED_BURST = TRUE
-AIMED_BURST_ALTERNATE_KEY = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 2
@@ -1000,16 +999,6 @@ ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
 
 ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
 
-;------------------------------------------------------------------------------------------------------------------------------
-; Default: FALSE 
-; Allow merc to automatically take mine with same id from inventory after using one
-; If no item found, then first available mine will be taken from inventory
-; For this feature to work, SHIFT key must be pressed while planting mine
-; Also, this allows to plant tripwire with previously selected network type and hierarchy (with SHIFT key pressed)
-;------------------------------------------------------------------------------------------------------------------------------
-
-IMPROVED_BOMB_PLANTING = FALSE
-
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 100 
 ; Chance to say annoying phrase.

gamedir/Data/Ja2_Options.INI

@@ -930,14 +930,13 @@ ALT_AIMING_ENABLED = FALSE
 ; Default: FALSE
 ; The merc can now perform aimed burst fire and aimed auto fire.
 ; Due to the reworked auto and burst penalties aimed auto-fire is less efficient then aimed burst for all guns. There is simply
-; no use in firing more then 3 rounds due to low CtH od the last bullets. Aiming is performed by the mouse scrolling wheel. 
+; no use in firing more then 3 rounds due to low CtH for the last bullets. Aiming is performed by the mouse scrolling wheel. 
 ; ENABLE_EXT_MOUSE_KEYS must be set to TRUE for this option.
 ;
-; If your mousewheel does not work, you can do the same via [o] if AIMED_BURST_ALTERNATE_KEY is TRUE.
+; If mousewheel does not work for aiming, alternative method via [,] (comma) to increase aim; [ALT + ,] to decrease aim.
 ;------------------------------------------------------------------------------------------------------------------------------
 
 USE_AIMED_BURST = FALSE
-AIMED_BURST_ALTERNATE_KEY = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 2
@@ -999,16 +998,6 @@ ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
 
 ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
 
-;------------------------------------------------------------------------------------------------------------------------------
-; Default: FALSE 
-; Allow merc to automatically take mine with same id from inventory after using one
-; If no item found, then first available mine will be taken from inventory
-; For this feature to work, SHIFT key must be pressed while planting mine
-; Also, this allows to plant tripwire with previously selected network type and hierarchy (with SHIFT key pressed)
-;------------------------------------------------------------------------------------------------------------------------------
-
-IMPROVED_BOMB_PLANTING = FALSE
-
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 100 
 ; Chance to say annoying phrase.