- new property (ENABLE_CHANCE_OF_ENEMY_AMBUSHES_ON_INSANE_DIFFICULT) for the enemy ambushes which are in the game since the beginning of 1.13 development

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1836 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameSettings.cpp

@@ -705,6 +705,9 @@ void LoadGameExternalOptions()
 	// Kaiden: Vehicle Inventory change - Added INI file Option VEHICLE_INVENTORY
 	gGameExternalOptions.fVehicleInventory					= iniReader.ReadBoolean("JA2 Gameplay Settings", "VEHICLE_INVENTORY", TRUE);
 
+	// WANNE: Added INI file Option for enemy ambushes, so we also have the option to play vanilla ja2 ambush settings
+	gGameExternalOptions.fEnableChanceOfEnemyAmbushesOnInsaneDifficult = iniReader.ReadBoolean("JA2 Gameplay Settings", "ENABLE_CHANCE_OF_ENEMY_AMBUSHES_ON_INSANE_DIFFICULT", TRUE);
+
 }
 
 

GameSettings.h

@@ -209,6 +209,8 @@ typedef struct
 	// Kaiden: Vehicle Inventory change - Added for INI Option
 	BOOLEAN fVehicleInventory;
 
+	BOOLEAN fEnableChanceOfEnemyAmbushesOnInsaneDifficult;
+
 	// System settings
 	UINT8 gubDeadLockDelay;
 	BOOLEAN gfEnableEmergencyButton_SkipStrategicEvents;

Strategic/PreBattle Interface.cpp

@@ -543,8 +543,10 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 					{
 						gubEnemyEncounterCode = ENEMY_AMBUSH_CODE;
 					}
-					// Madd
-					else if( gGameOptions.ubDifficultyLevel == DIF_LEVEL_INSANE && 
+					// Madd:  
+					// WANNE: Added an ja2_options.ini Property "ENABLE_CHANCE_OF_ENEMY_AMBUSHES_ON_INSANE_DIFFICULT"
+					else if( gGameExternalOptions.fEnableChanceOfEnemyAmbushesOnInsaneDifficult && 
+						gGameOptions.ubDifficultyLevel == DIF_LEVEL_INSANE && 
 									 CurrentPlayerProgressPercentage() >= 25 )
 					{ //if the enemy outnumbers the players, then there is a chance of the enemies ambushing the group
 						if( ubNumMobileEnemies > ubNumMercs )