Added missing "ja2_options.ini" properties for last exe build (2567):

AUTO_SAVE_ON_ASSERTION_FAILURE
---------------------
GAME_PROGRESS_MINIMUM
GAME_PROGRESS_INCREMENT
IMP_STARTING_LEVEL
SMART_GOGGLE_SWITCH
AUTOMATICALLY_FLAG_MINES
--------------------
MAX_NUMBER_PLAYER_MERCS
MAX_NUMBER_PLAYER_VEHICLES
MAX_NUMBER_ENEMIES
MAX_NUMBER_CREATURES
MAX_NUMBER_REBELS
MAX_NUMBER_CIVS
---------------------
NEW_AGGRESSIVE_AI
---------------------
TONY_USES_BR_SETTING
DEVIN_USES_BR_SETTING

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

gamedir/Data-1.13/Ja2_Options.INI

@@ -170,6 +170,8 @@ DEAD_LOCK_DELAY = 30
 ; Skip global strategic events (use to prevent game crashes). Press and hold NUMLOCK to skip
 ENABLE_EMERGENCY_BUTTON_NUMLOCK_TO_SKIP_STRATEGIC_EVENTS = FALSE
 
+; Automatically try to save when an assertion failure occurs
+AUTO_SAVE_ON_ASSERTION_FAILURE = TRUE
 
 ;******************************************************************************************************************************
 ; -----------------------------------------------------------------------------------------------------------------------------
@@ -454,6 +456,27 @@ GAME_PROGRESS_INCOME = 50
 
 ; Sectors visited
 GAME_PROGRESS_VISITED = 0
+; The following two are used to modify the total game progress slightly and take values between 0% and 100%. Defaults 
+; are both 0.  You can use these values to "skip" past the early combat where the foes have pathetic equipment.
+; These values will also affect the inventory at Bobby Rays because it is based off game progress.
+;
+; The minimum acts as a floor value for the in-game progress, i.e., until the normally computed progress surpasses
+; it this value is used as the game progress.
+GAME_PROGRESS_MINIMUM = 0
+
+; The increment is just added to the normally computed game progress but of course cannot make it higher than 100%
+GAME_PROGRESS_INCREMENT = 0
+
+; The starting level of IMP mercs, 1 through 7, default is 1
+IMP_STARTING_LEVEL = 1
+
+; If TRUE Shift-N will switch to best night vision goggles at night and best sunglasses during the day
+; If FALSE whatever the merc is wearing will be switched with the best of the other kind (the "classic" behavior)
+SMART_GOGGLE_SWITCH = TRUE
+
+; If TRUE when a character finds a mine they will automatically put a blue flag there without asking
+; If FALSE when a character finds a mine they will ask whether to put a blue flag there (the "classic" behavior)
+AUTOMATICALLY_FLAG_MINES = TRUE
 
 ;******************************************************************************************************************************
 ; Time when some global events occur
@@ -469,6 +492,22 @@ GAME_PROGRESS_MIKE_AVAILABLE = 50
 ; Default 70
 GAME_PROGRESS_IGGY_AVAILABLE = 70
 
+;******************************************************************************************************************************
+; Use these to adjust the numbers of various sorts of "people" that can appear on one map.
+;******************************************************************************************************************************
+; Player mercs, valid values 16 through 32, default is 24
+MAX_NUMBER_PLAYER_MERCS = 24
+; Player vehicles, valid values 2 through 6, default is 2.  Note that only 2 are really supported right now.
+MAX_NUMBER_PLAYER_VEHICLES = 2
+; Enemies (i.e., soldiers), valid values 16 through 64, default is 32
+MAX_NUMBER_ENEMIES = 32
+; Creatures (i.e., bloodcats and crepitus), valid values 16 through 40, default is 32
+MAX_NUMBER_CREATURES = 32
+; Rebels (i.e., militia), valid values 16 through 64, default is 32
+MAX_NUMBER_REBELS = 32
+; Civilians, valid values 16 through 40, default is 32
+MAX_NUMBER_CIVS = 32
+
 ;******************************************************************************************************************************
 ; Strategic Events on/off
 ;******************************************************************************************************************************
@@ -506,6 +545,9 @@ GUN_DAMAGE_MULTIPLIER =        0
 
 MAX_STRATEGIC_TEAM_SIZE = 20
 
+; This is not used yet
+NEW_AGGRESSIVE_AI = FALSE
+
 ; Amount of troops avaliable to the queen at game start
 NOVICE_QUEENS_POOL_OF_TROOPS =      150
 EXPERIENCED_QUEENS_POOL_OF_TROOPS = 200
@@ -698,6 +740,15 @@ MINIMUM_MILITIA_SQUAD_SIZE = 5
 ; Maximum possible militia squad size
 MAXIMUM_MILITIA_SQUAD_SIZE = 20
 
+;******************************************************************************************************************************
+; Merchant coolness settings
+; TONY_USES_BR_SETTING - Tony uses Bobby Ray's setting (makes his inventory better)
+; DEVIN_USES_BR_SETTING - Devin uses Bobby Ray's setting (makes his inventory better)
+;******************************************************************************************************************************
+
+TONY_USES_BR_SETTING = FALSE
+DEVIN_USES_BR_SETTING = TRUE
+
 ;******************************************************************************************************************************
 ; MAX_MILITIA_PER_SECTOR defines the max number of Militia that can be trained in each sector. 
 ; Keep in mind that there is not enough room on the strategic map to display more than 20
@@ -890,6 +941,6 @@ RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE = FALSE
 USE_ENHANCED_DESCRIPTION_BOX = 0
 
 ;******************************************************************************************************************************
-; Use the file "prof.dat" for all difficult settings. This only makes sense for Modders.
+; Use the file "prof.dat" for all difficult settings instead of the specific ones.
 ;******************************************************************************************************************************
 ALWAYS_USE_PROF_DAT = FALSE

gamedir/Data/Ja2_Options.INI

@@ -170,6 +170,8 @@ DEAD_LOCK_DELAY = 30
 ; Skip global strategic events (use to prevent game crashes). Press and hold NUMLOCK to skip
 ENABLE_EMERGENCY_BUTTON_NUMLOCK_TO_SKIP_STRATEGIC_EVENTS = FALSE
 
+; Automatically try to save when an assertion failure occurs
+AUTO_SAVE_ON_ASSERTION_FAILURE = TRUE
 
 ;******************************************************************************************************************************
 ; -----------------------------------------------------------------------------------------------------------------------------
@@ -452,6 +454,28 @@ GAME_PROGRESS_INCOME = 50
 ; Sectors visited
 GAME_PROGRESS_VISITED = 0
 
+; The following two are used to modify the total game progress slightly and take values between 0% and 100%. Defaults 
+; are both 0.  You can use these values to "skip" past the early combat where the foes have pathetic equipment.
+; These values will also affect the inventory at Bobby Rays because it is based off game progress.
+;
+; The minimum acts as a floor value for the in-game progress, i.e., until the normally computed progress surpasses
+; it this value is used as the game progress.
+GAME_PROGRESS_MINIMUM = 0
+
+; The increment is just added to the normally computed game progress but of course cannot make it higher than 100%
+GAME_PROGRESS_INCREMENT = 0
+
+; The starting level of IMP mercs, 1 through 7, default is 1
+IMP_STARTING_LEVEL = 1
+
+; If TRUE Shift-N will switch to best night vision goggles at night and best sunglasses during the day
+; If FALSE whatever the merc is wearing will be switched with the best of the other kind (the "classic" behavior)
+SMART_GOGGLE_SWITCH = FALSE
+
+; If TRUE when a character finds a mine they will automatically put a blue flag there without asking
+; If FALSE when a character finds a mine they will ask whether to put a blue flag there (the "classic" behavior)
+AUTOMATICALLY_FLAG_MINES = FALSE
+
 ;******************************************************************************************************************************
 ; Time when some global events occur
 ; Range: 0-100%
@@ -466,6 +490,22 @@ GAME_PROGRESS_MIKE_AVAILABLE = 50
 ; Default 70
 GAME_PROGRESS_IGGY_AVAILABLE = 70
 
+;******************************************************************************************************************************
+; Use these to adjust the numbers of various sorts of "people" that can appear on one map.
+;******************************************************************************************************************************
+; Player mercs, valid values 16 through 32, default is 24
+MAX_NUMBER_PLAYER_MERCS = 24
+; Player vehicles, valid values 2 through 6, default is 2.  Note that only 2 are really supported right now.
+MAX_NUMBER_PLAYER_VEHICLES = 2
+; Enemies (i.e., soldiers), valid values 16 through 64, default is 32
+MAX_NUMBER_ENEMIES = 32
+; Creatures (i.e., bloodcats and crepitus), valid values 16 through 40, default is 32
+MAX_NUMBER_CREATURES = 32
+; Rebels (i.e., militia), valid values 16 through 64, default is 32
+MAX_NUMBER_REBELS = 32
+; Civilians, valid values 16 through 40, default is 32
+MAX_NUMBER_CIVS = 32
+
 ;******************************************************************************************************************************
 ; Strategic Events on/off
 ;******************************************************************************************************************************
@@ -503,6 +543,8 @@ GUN_DAMAGE_MULTIPLIER =        0
 
 MAX_STRATEGIC_TEAM_SIZE = 20
 
+; This is not used yet
+NEW_AGGRESSIVE_AI = FALSE
 ; Amount of troops avaliable to the queen at game start
 NOVICE_QUEENS_POOL_OF_TROOPS =      150
 EXPERIENCED_QUEENS_POOL_OF_TROOPS = 200
@@ -694,6 +736,14 @@ MINIMUM_MILITIA_SQUAD_SIZE = 5
 
 ; Maximum possible militia squad size
 MAXIMUM_MILITIA_SQUAD_SIZE = 20
+;******************************************************************************************************************************
+; Merchant coolness settings
+; TONY_USES_BR_SETTING - Tony uses Bobby Ray's setting (makes his inventory better)
+; DEVIN_USES_BR_SETTING - Devin uses Bobby Ray's setting (makes his inventory better)
+;******************************************************************************************************************************
+
+TONY_USES_BR_SETTING = FALSE
+DEVIN_USES_BR_SETTING = TRUE
 
 ;******************************************************************************************************************************
 ; MAX_MILITIA_PER_SECTOR defines the max number of Militia that can be trained in each sector. 
@@ -864,15 +914,6 @@ ENABLE_CHANCE_OF_ENEMY_AMBUSHES_ON_INSANE_DIFFICULT = FALSE
 
 SLAY_FOREVER = FALSE
 
-;******************************************************************************************************************************
-; Loose round reload system.
-; AP_COST_PER_ROUND represents the AP cost to reload a single round of ammunition
-; WRONG_MAG_MULT is the multiplier applied to reload AP cost when trying to reload from an improper sized mag
-;******************************************************************************************************************************
-AP_COST_PER_ROUND = 2
-
-WRONG_MAG_MULT = 1.5
-
 ;******************************************************************************************************************************
 ; Allow the item description and stack popup windows to be accessed from the sector inventory panel
 ;******************************************************************************************************************************
@@ -898,6 +939,6 @@ RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE = TRUE
 USE_ENHANCED_DESCRIPTION_BOX = 0
 
 ;******************************************************************************************************************************
-; Use the file "prof.dat" for all difficult settings. This only makes sense for Modders.
+; Use the file "prof.dat" for all difficult settings instead of the specific ones.
 ;******************************************************************************************************************************
 ALWAYS_USE_PROF_DAT = FALSE