From 31b17d99d0db2be5fa49272ea433a92532e3c30f Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 2 Feb 2022 03:41:34 +0000
Subject: [PATCH] Fixed bug in ASD code causing enemy patrols to have 0 elites
 no matter if ASD was enabled or not. I also changed the ASD feature, for
 patrols only, to assign tanks and jeeps in place of elites. So if the patrol
 spawned without any elite it can't have tank and jeep. Robots are still
 placed instead of regular troops, which however means that patrol full of
 elites will never have any robots.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/Strategic AI.cpp | 44 ++++++++++++++++++++++++++++++++++++--
 Strategic/Strategic AI.h   |  1 +
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp
index 535ba0e9..5ae88375 100644
--- a/Strategic/Strategic AI.cpp	
+++ b/Strategic/Strategic AI.cpp	
@@ -3146,7 +3146,10 @@ BOOLEAN SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoi
 		pGroup = CreateNewEnemyGroupDepartingFromSector( SECTOR( gModSettings.ubSAISpawnSectorX, gModSettings.ubSAISpawnSectorY ), 0, (UINT8)iReinforcementsApproved, 0, 0, 0, 0 );
 		ConvertGroupTroopsToComposition( pGroup, gGarrisonGroup[ iDstGarrisonID ].ubComposition );
 		pGroup->ubOriginalSector = (UINT8)SECTOR( ubDstSectorX, ubDstSectorY );
-		InitializeGroup(GROUP_TYPE_PATROL, (UINT8)iReinforcementsApproved, *pGroup->pEnemyGroup, Random(10) < gGameOptions.ubDifficultyLevel );
+		if (gGameExternalOptions.fASDActive && Random(10) < gGameOptions.ubDifficultyLevel)
+		{
+			ASDInitializePatrolGroup(pGroup);
+		}
 		//Madd: unlimited reinforcements?
 		if ( !gfUnlimitedTroops )
 			giReinforcementPool -= iReinforcementsApproved;
@@ -3236,7 +3239,10 @@ BOOLEAN SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoi
 
 			pGroup = CreateNewEnemyGroupDepartingFromSector( gGarrisonGroup[ iSrcGarrisonID ].ubSectorID, 0, (UINT8)iReinforcementsApproved, 0, 0, 0, 0 );
 			ConvertGroupTroopsToComposition( pGroup, gGarrisonGroup[ iDstGarrisonID ].ubComposition );
-			InitializeGroup(GROUP_TYPE_PATROL, (UINT8)iReinforcementsApproved, *pGroup->pEnemyGroup, Random(10) < gGameOptions.ubDifficultyLevel );
+			if (gGameExternalOptions.fASDActive && Random(10) < gGameOptions.ubDifficultyLevel)
+			{
+				ASDInitializePatrolGroup(pGroup);
+			}
 			RemoveSoldiersFromGarrisonBasedOnComposition( iSrcGarrisonID, pGroup->ubGroupSize );
 			pGroup->ubOriginalSector = (UINT8)SECTOR( ubDstSectorX, ubDstSectorY );
 			pGroup->ubMoveType = ONE_WAY;
@@ -7047,6 +7053,40 @@ GROUP* FindPendingGroupForGarrisonSector( UINT8 ubSectorID )
 	return NULL;
 }
 
+//Shadooow: new function to upgrade patrols groups with ASD to avoid overriding default patrol team composition
+void ASDInitializePatrolGroup(GROUP *pGroup)
+{
+	if (pGroup->ubGroupSize > 0 && pGroup->pEnemyGroup->ubNumElites > 0)
+	{
+		if (gGameExternalOptions.fASDAssignsTanks && ASDSoldierUpgradeToTank())
+		{
+			pGroup->pEnemyGroup->ubNumElites--;
+			pGroup->pEnemyGroup->ubNumTanks++;
+		}
+
+		if (pGroup->pEnemyGroup->ubNumElites > 0 && gGameExternalOptions.fASDAssignsJeeps && ASDSoldierUpgradeToJeep())
+		{
+			pGroup->pEnemyGroup->ubNumElites--;
+			pGroup->pEnemyGroup->ubNumJeeps++;
+		}
+
+		if (pGroup->pEnemyGroup->ubNumTroops > 0 && gGameExternalOptions.fASDAssignsRobots && ASDSoldierUpgradeToRobot())
+		{
+			int numRobots = 1 + Random(gGameOptions.ubDifficultyLevel);
+			if (numRobots > pGroup->pEnemyGroup->ubNumTroops)
+			{
+				pGroup->pEnemyGroup->ubNumRobots += pGroup->pEnemyGroup->ubNumTroops;
+				pGroup->pEnemyGroup->ubNumTroops = 0;
+			}
+			else
+			{
+				pGroup->pEnemyGroup->ubNumRobots += numRobots;
+				pGroup->pEnemyGroup->ubNumTroops -= numRobots;
+			}
+		}
+	}
+}
+
 void InitializeGroup( const GROUP_TYPE groupType, const UINT8 groupSize, ENEMYGROUP& enemyGroup, const BOOLEAN asdUpgrade )
 {
 	InitializeGroup( groupType, groupSize, enemyGroup.ubNumTroops, enemyGroup.ubNumElites, enemyGroup.ubNumRobots, enemyGroup.ubNumJeeps, enemyGroup.ubNumTanks, asdUpgrade );
diff --git a/Strategic/Strategic AI.h b/Strategic/Strategic AI.h
index 3f2d3b80..77d9c3a6 100644
--- a/Strategic/Strategic AI.h	
+++ b/Strategic/Strategic AI.h	
@@ -81,6 +81,7 @@ enum GROUP_TYPE
 	GROUP_TYPE_PATROL
 };
 
+void ASDInitializePatrolGroup(GROUP *pGroup);
 void InitializeGroup(const GROUP_TYPE groupType, const UINT8 groupSize, ENEMYGROUP& enemyGroup, const BOOLEAN asdUpgrade);
 void InitializeGroup(const GROUP_TYPE groupType, const UINT8 groupSize, UINT8 &troopCount, UINT8 &eliteCount, UINT8 &robotCount, UINT8 &jeepCount, UINT8 &tankCount, const BOOLEAN asdUpgrade);