From 614738581a39570c272f69969da8d7b19ca447a4 Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 26 Apr 2021 05:42:30 +0000
Subject: [PATCH] Removed unused options (by rftr).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2589 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/Ja2_Options.INI | 14 +-------------
 gamedir/Data/Ja2_Options.INI      | 12 ------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 97e2d5545..fb6ec4734 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -3323,24 +3323,12 @@ RND_ENTER_MILITIA_REINFORCEMENTS = 6
 ; Don't allow permanent items removal for no merc in that sector
 NO_REMOVE_RANDOM_SECTOR_ITEMS = TRUE
 
-; Depending on game difficulty enemy groups created during offensives can include tanks.
-ARMY_USES_TANKS_IN_ATTACKS = TRUE
-; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. 
-ARMY_USES_TANKS_IN_PATROLS = TRUE
 ; Minimum progress required for tanks to appear.
 TANK_MINIMUM_PROGRESS = 60
 
-; Depending on game difficulty enemy groups created during offensives can include jeeps.
-ARMY_USES_JEEPS_IN_ATTACKS = TRUE
-; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. 
-ARMY_USES_JEEPS_IN_PATROLS = TRUE
 ; Minimum progress required for jeep to appear.
 JEEP_MINIMUM_PROGRESS = 30
 
-; Depending on game difficulty enemy groups created during offensives can include robots.
-ARMY_USES_ROBOTS_IN_ATTACKS = TRUE
-; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. 
-ARMY_USES_ROBOTS_IN_PATROLS = TRUE
 ; Minimum progress required for enemy robots to appear.
 ROBOT_MINIMUM_PROGRESS = 45
 
@@ -3837,7 +3825,7 @@ ASD_TIME_TANK		= 1440
 ASD_TIME_ROBOT		= 720
 
 ;------------------------------------------------------------------------------------------------------------------------------
-; Determine whether ASD assigns tanks and jeeps to enemy patrols and jeeps
+; Determine whether ASD assigns tanks and jeeps to enemy patrols and groups
 ;------------------------------------------------------------------------------------------------------------------------------
 ASD_ASSIGNS_TANKS  = TRUE
 ASD_ASSIGNS_JEEPS  = TRUE
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 6954db3dc..3a659e6b3 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -3299,24 +3299,12 @@ RND_ENTER_MILITIA_REINFORCEMENTS = 6
 ; Don't allow permanent items removal for no merc in that sector
 NO_REMOVE_RANDOM_SECTOR_ITEMS = FALSE
 
-; Depending on game difficulty enemy groups created during offensives can include tanks.
-ARMY_USES_TANKS_IN_ATTACKS = FALSE
-; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. 
-ARMY_USES_TANKS_IN_PATROLS = FALSE
 ; Minimum progress required for tanks to appear.
 TANK_MINIMUM_PROGRESS = 60
 
-; Depending on game difficulty enemy groups created during offensives can include jeeps.
-ARMY_USES_JEEPS_IN_ATTACKS = FALSE
-; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. 
-ARMY_USES_JEEPS_IN_PATROLS = FALSE
 ; Minimum progress required for jeep to appear.
 JEEP_MINIMUM_PROGRESS = 30
 
-; Depending on game difficulty enemy groups created during offensives can include robots.
-ARMY_USES_ROBOTS_IN_ATTACKS = FALSE
-; Depending on game difficulty enemy patrols at game start can be randomly reinforced with. 
-ARMY_USES_ROBOTS_IN_PATROLS = FALSE
 ; Minimum progress required for enemy robots to appear.
 ROBOT_MINIMUM_PROGRESS = 45