Change strategic enemy amounts to UINT16

2026-08-19 14:20:30 +02:00 · 2024-11-10 22:02:46 +02:00
parent d9edc9362b
commit 0089e0a640
11 changed files with 85 additions and 85 deletions
@@ -470,9 +470,9 @@ BOOLEAN SendReinforcementsForPatrol( INT32 iPatrolID, GROUP **pOptionalGroup );

 void ClearPreviousAIGroupAssignment( GROUP *pGroup );

-void CalcNumTroopsBasedOnComposition( UINT8 *pubNumTroops, UINT8 *pubNumElites, UINT8 ubTotal, INT32 iCompositionID );
+void CalcNumTroopsBasedOnComposition( UINT16 *pubNumTroops, UINT16 *pubNumElites, UINT16 ubTotal, INT32 iCompositionID );
 void ConvertGroupTroopsToComposition( GROUP *pGroup, INT32 iCompositionID );
-void RemoveSoldiersFromGarrisonBasedOnComposition( INT32 iGarrisonID, UINT8 ubSize );
+void RemoveSoldiersFromGarrisonBasedOnComposition( INT32 iGarrisonID, UINT16 ubSize );

 //If there are any enemy groups that will be moving through this sector due, they will have to repath which
 //will cause them to avoid the sector.	Returns the number of redirected groups.
@@ -1151,8 +1151,8 @@ void InitStrategicAI()
 	INT32 iStartPop, iDesiredPop, iPriority;
 	SECTORINFO *pSector = NULL;
 	GROUP *pGroup;
-	UINT8 ubNumTroops;
-	UINT8 ubNumRobots, ubNumTanks, ubNumJeeps;
+	UINT16 ubNumTroops;
+	UINT16 ubNumRobots, ubNumTanks, ubNumJeeps;
 	INT32 iPercentElitesBonus;
 	INT32 iMaxEnemyGroupSize = gGameExternalOptions.iMaxEnemyGroupSize;
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic3");
@@ -1538,9 +1538,9 @@ void InitStrategicAI()
 		//based on the difficulty settings in the above patrol table.
 		//if( gPatrolGroup[ i ].ubUNUSEDStartIfDifficulty <= gGameOptions.ubDifficultyLevel )
 		{
-			UINT8 troopCount = (UINT8)(gPatrolGroup[ i ].bSize + Random( 3 ) - 1);
-			troopCount = (UINT8)max( gubMinEnemyGroupSize, min( iMaxEnemyGroupSize, troopCount) );
-			UINT8 ubNumElites;
+			UINT16 troopCount = (UINT16)(gPatrolGroup[ i ].bSize + Random( 3 ) - 1);
+			troopCount = (UINT16)max( gubMinEnemyGroupSize, min( iMaxEnemyGroupSize, troopCount) );
+			UINT16 ubNumElites;
 			InitializeGroup(GROUP_TYPE_PATROL, troopCount, ubNumTroops, ubNumElites, ubNumRobots, ubNumJeeps, ubNumTanks, Random(10) < gGameOptions.ubDifficultyLevel && i != 3 && i != 4);

 			//Note on adding patrol groups...
@@ -2237,12 +2237,12 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic5");
 				if( gGarrisonGroup[ i ].ubSectorID != SECTOR( gModSettings.ubSAISpawnSectorX, gModSettings.ubSAISpawnSectorY ) )
 				{
 					EliminateSurplusTroopsForGarrison( pGroup, pSector );
-					pSector->ubNumAdmins = (UINT8)(pSector->ubNumAdmins + pGroup->pEnemyGroup->ubNumAdmins);
-					pSector->ubNumTroops = (UINT8)(pSector->ubNumTroops + pGroup->pEnemyGroup->ubNumTroops);
-					pSector->ubNumElites = (UINT8)(pSector->ubNumElites + pGroup->pEnemyGroup->ubNumElites);
-					pSector->ubNumRobots = (UINT8)(pSector->ubNumRobots + pGroup->pEnemyGroup->ubNumRobots);
-					pSector->ubNumTanks = (UINT8)(pSector->ubNumTanks + pGroup->pEnemyGroup->ubNumTanks);
-					pSector->ubNumJeeps = (UINT8)(pSector->ubNumJeeps + pGroup->pEnemyGroup->ubNumJeeps);
+					pSector->ubNumAdmins = (pSector->ubNumAdmins + pGroup->pEnemyGroup->ubNumAdmins);
+					pSector->ubNumTroops = (pSector->ubNumTroops + pGroup->pEnemyGroup->ubNumTroops);
+					pSector->ubNumElites = (pSector->ubNumElites + pGroup->pEnemyGroup->ubNumElites);
+					pSector->ubNumRobots = (pSector->ubNumRobots + pGroup->pEnemyGroup->ubNumRobots);
+					pSector->ubNumTanks = (pSector->ubNumTanks + pGroup->pEnemyGroup->ubNumTanks);
+					pSector->ubNumJeeps = (pSector->ubNumJeeps + pGroup->pEnemyGroup->ubNumJeeps);

 #ifdef JA2BETAVERSION
 					LogStrategicEvent( "%d reinforcements have arrived to garrison sector %c%d",
@@ -2325,7 +2325,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic5");
 					pPatrolGroup->pEnemyGroup->ubNumRobots += pGroup->pEnemyGroup->ubNumRobots;
 					pPatrolGroup->pEnemyGroup->ubNumTanks += pGroup->pEnemyGroup->ubNumTanks;
 					pPatrolGroup->pEnemyGroup->ubNumJeeps += pGroup->pEnemyGroup->ubNumJeeps;
-					pPatrolGroup->ubGroupSize += (UINT8)(pGroup->pEnemyGroup->ubNumTroops + pGroup->pEnemyGroup->ubNumElites + pGroup->pEnemyGroup->ubNumAdmins 
+					pPatrolGroup->ubGroupSize += (pGroup->pEnemyGroup->ubNumTroops + pGroup->pEnemyGroup->ubNumElites + pGroup->pEnemyGroup->ubNumAdmins 
 														  + pGroup->pEnemyGroup->ubNumRobots + pGroup->pEnemyGroup->ubNumTanks + pGroup->pEnemyGroup->ubNumJeeps);
 					#ifdef JA2BETAVERSION
 						LogStrategicEvent( "%d reinforcements have joined patrol group at sector %c%d (new size: %d)",
@@ -2678,7 +2678,7 @@ void CheckEnemyControlledSector( UINT8 ubSectorID )
 					{
 						if( pGroup->pEnemyGroup->ubPendingReinforcements > 4 )
 						{
-							UINT8 ubNum = (UINT8)(3 + Random( 3 ));
+							UINT16 ubNum = (UINT16)(3 + Random( 3 ));
 							pGroup->pEnemyGroup->ubNumTroops += ubNum;
 							pGroup->ubGroupSize += ubNum;
 							pGroup->pEnemyGroup->ubPendingReinforcements -= ubNum;
@@ -3044,7 +3044,7 @@ BOOLEAN SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoi
 	GROUP *pGroup;
 	UINT8 ubSrcSectorX, ubSrcSectorY, ubDstSectorX, ubDstSectorY;
 	UINT8 ubNumExtraReinforcements;
-	UINT8 ubGroupSize;
+	UINT16 ubGroupSize;
 	BOOLEAN fLimitMaxTroopsAllowable = FALSE;

 	Ensure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	/* added NULL fix, 2007-03-03, Sgt. Kolja */
@@ -3171,7 +3171,7 @@ BOOLEAN SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoi
 		pGroup->ubMoveType = ONE_WAY;
 		gGarrisonGroup[ iDstGarrisonID ].ubPendingGroupID = pGroup->ubGroupID;

-		ubGroupSize = (UINT8)(pGroup->pEnemyGroup->ubNumTroops + pGroup->pEnemyGroup->ubNumElites + pGroup->pEnemyGroup->ubNumAdmins + pGroup->pEnemyGroup->ubNumRobots + pGroup->pEnemyGroup->ubNumTanks + pGroup->pEnemyGroup->ubNumJeeps);
+		ubGroupSize = (UINT16)(pGroup->pEnemyGroup->ubNumTroops + pGroup->pEnemyGroup->ubNumElites + pGroup->pEnemyGroup->ubNumAdmins + pGroup->pEnemyGroup->ubNumRobots + pGroup->pEnemyGroup->ubNumTanks + pGroup->pEnemyGroup->ubNumJeeps);

 		if( ubNumExtraReinforcements )
 		{
@@ -3261,7 +3261,7 @@ BOOLEAN SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoi
 			pGroup->ubOriginalSector = (UINT8)SECTOR( ubDstSectorX, ubDstSectorY );
 			pGroup->ubMoveType = ONE_WAY;
 			gGarrisonGroup[ iDstGarrisonID ].ubPendingGroupID = pGroup->ubGroupID;
-			ubGroupSize = (UINT8)(pGroup->pEnemyGroup->ubNumTroops + pGroup->pEnemyGroup->ubNumElites + pGroup->pEnemyGroup->ubNumAdmins + pGroup->pEnemyGroup->ubNumRobots + pGroup->pEnemyGroup->ubNumTanks + pGroup->pEnemyGroup->ubNumJeeps);
+			ubGroupSize = (UINT16)(pGroup->pEnemyGroup->ubNumTroops + pGroup->pEnemyGroup->ubNumElites + pGroup->pEnemyGroup->ubNumAdmins + pGroup->pEnemyGroup->ubNumRobots + pGroup->pEnemyGroup->ubNumTanks + pGroup->pEnemyGroup->ubNumJeeps);

 			if( ubNumExtraReinforcements )
 			{
@@ -4510,15 +4510,15 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
 	UINT8 stagesector0, stagesector1, stagesector2, stagesector3;
 	UINT8 assaultsector0, assaultsector1, assaultsector2, assaultsector3;
 	unsigned ubNumSoldiers;
-	UINT8 ubNumRobots = 0;
-	UINT8 ubNumTanks = 0;
-	UINT8 ubNumJeeps = 0;
+	UINT16 ubNumRobots = 0;
+	UINT16 ubNumTanks = 0;
+	UINT16 ubNumJeeps = 0;
 	UINT32 totalusedsoldiers = 0;
-	UINT8 grouptroops[4] = {0,0,0,0};
-	UINT8 groupelites[4] = {0,0,0,0};
-	UINT8 grouprobots[4] = {0,0,0,0};
-	UINT8 grouptanks[4] = {0,0,0,0};
-	UINT8 groupjeeps[4] = {0, 0, 0, 0};
+	UINT16 grouptroops[4] = {0,0,0,0};
+	UINT16 groupelites[4] = {0,0,0,0};
+	UINT16 grouprobots[4] = {0,0,0,0};
+	UINT16 grouptanks[4] = {0,0,0,0};
+	UINT16 groupjeeps[4] = {0, 0, 0, 0};

 	UINT32 difficultyMod;
 	switch (gGameOptions.ubDifficultyLevel)
@@ -5211,12 +5211,12 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
 						soldiersThisSquad = (unsigned)gGameExternalOptions.iMaxEnemyGroupSize;
 					}
 					ubNumSoldiers -= soldiersThisSquad;
-					UINT8 adminsThisSquad = 0;
-					UINT8 troopsThisSquad = 0;
-					UINT8 elitesThisSquad = 0;
-					UINT8 robotsThisSquad = 0;
-					UINT8 tanksThisSquad = 0;
-					UINT8 jeepsThisSquad = 0;
+					UINT16 adminsThisSquad = 0;
+					UINT16 troopsThisSquad = 0;
+					UINT16 elitesThisSquad = 0;
+					UINT16 robotsThisSquad = 0;
+					UINT16 tanksThisSquad = 0;
+					UINT16 jeepsThisSquad = 0;
 					// this is an attack group, but set it to patrol since we'll set the admin/regular/elite composition by hand here
 					InitializeGroup(GROUP_TYPE_PATROL, soldiersThisSquad, troopsThisSquad, elitesThisSquad, robotsThisSquad, jeepsThisSquad, tanksThisSquad, Random(10 * 100) < difficultyMod * direness);
 					if (direness < 25) {
@@ -5259,7 +5259,7 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
 				// Note:  1st optional parm is a count of troops to send
 				//        2nd optional parm is the composition of troops
 				if (option1 > 0 && option1 < 256) {
-					ubNumSoldiers = (UINT8)(option1);
+					ubNumSoldiers = option1;
 				} else {
 					// Something is goofy, just send a default sized squad
 					ubNumSoldiers = gubMinEnemyGroupSize;
@@ -5351,7 +5351,7 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
 			if ( !gfUnlimitedTroops )
 				giReinforcementPool -= ubNumSoldiers;

-			UINT8 ubNumTroops, ubNumElites;
+			UINT16 ubNumTroops, ubNumElites;
 			// set the type to patrol as we're manually tuning the group composition here (100% elites + ASD upgrades)
 			InitializeGroup(GROUP_TYPE_PATROL, ubNumSoldiers, ubNumTroops, ubNumElites, ubNumRobots, ubNumJeeps, ubNumTanks, Random(10*100) < difficultyMod * HighestPlayerProgressPercentage());

@@ -6751,7 +6751,7 @@ void ClearPreviousAIGroupAssignment( GROUP *pGroup )
 	}
 }

-void CalcNumTroopsBasedOnComposition( UINT8 *pubNumTroops, UINT8 *pubNumElites, UINT8 ubTotal, INT32 iCompositionID )
+void CalcNumTroopsBasedOnComposition( UINT16 *pubNumTroops, UINT16 *pubNumElites, UINT16 ubTotal, INT32 iCompositionID )
 {
 	*pubNumTroops = gArmyComp[ iCompositionID ].bTroopPercentage * ubTotal / 100;
 	*pubNumElites = gArmyComp[ iCompositionID ].bElitePercentage * ubTotal / 100;
@@ -6795,19 +6795,19 @@ void ConvertGroupTroopsToComposition( GROUP *pGroup, INT32 iCompositionID )
 	ValidateLargeGroup( pGroup );
 }

-void RemoveSoldiersFromGarrisonBasedOnComposition( INT32 iGarrisonID, UINT8 ubSize )
+void RemoveSoldiersFromGarrisonBasedOnComposition( INT32 iGarrisonID, UINT16 ubSize )
 {
 	SECTORINFO *pSector;
 	INT32 iCompositionID;
-	UINT8 ubNumTroops, ubNumElites;
+	UINT16 ubNumTroops, ubNumElites;

 	//debug stuff
-	UINT8 ubOrigSectorAdmins;
-	UINT8 ubOrigSectorTroops;
-	UINT8 ubOrigSectorElites;
-	UINT8 ubOrigNumElites;
-	UINT8 ubOrigNumTroops;
-	UINT8 ubOrigSize;
+	UINT16 ubOrigSectorAdmins;
+	UINT16 ubOrigSectorTroops;
+	UINT16 ubOrigSectorElites;
+	UINT16 ubOrigNumElites;
+	UINT16 ubOrigNumTroops;
+	UINT16 ubOrigSize;

 Ensure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	/* added NULL fix, 2007-03-03, Sgt. Kolja */
 	iCompositionID = gGarrisonGroup[ iGarrisonID ].ubComposition;
@@ -7084,12 +7084,12 @@ 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 UINT16 groupSize, ENEMYGROUP& enemyGroup, const BOOLEAN asdUpgrade )
 {
 	InitializeGroup( groupType, groupSize, enemyGroup.ubNumTroops, enemyGroup.ubNumElites, enemyGroup.ubNumRobots, enemyGroup.ubNumJeeps, enemyGroup.ubNumTanks, asdUpgrade );
 }

-void InitializeGroup( const GROUP_TYPE groupType, const UINT8 groupSize, UINT8 &troopCount, UINT8 &eliteCount, UINT8 &robotCount, UINT8 &jeepCount, UINT8 &tankCount, const BOOLEAN asdUpgrade )
+void InitializeGroup( const GROUP_TYPE groupType, const UINT16 groupSize, UINT16 &troopCount, UINT16 &eliteCount, UINT16 &robotCount, UINT16 &jeepCount, UINT16 &tankCount, const BOOLEAN asdUpgrade )
 {
 	troopCount = groupSize;
 	eliteCount = 0;