New feature: transport groups

GameSettings.cpp

@@ -248,6 +248,7 @@ void UpdateFeatureFlags()
 		gGameExternalOptions.gfAllowSnow = gGameSettings.fFeatures[FF_ALLOW_SNOW];
 		gGameExternalOptions.fMiniEventsEnabled = gGameSettings.fFeatures[FF_MINI_EVENTS];
 		gGameExternalOptions.fRebelCommandEnabled = gGameSettings.fFeatures[FF_REBEL_COMMAND];
+		gGameExternalOptions.fStrategicTransportGroupsEnabled = gGameSettings.fFeatures[FF_STRATEGIC_TRANSPORT_GROUPS];
 	}
 	else
 	{
@@ -497,6 +498,7 @@ BOOLEAN LoadFeatureFlags()
 			gGameSettings.fFeatures[FF_ALLOW_SNOW]						= iniReader.ReadBoolean("JA2 Feature Flags", "FF_ALLOW_SNOW", TRUE, FALSE);
 			gGameSettings.fFeatures[FF_MINI_EVENTS]						= iniReader.ReadBoolean("JA2 Feature Flags", "FF_MINI_EVENTS", FALSE, FALSE);
 			gGameSettings.fFeatures[FF_REBEL_COMMAND]					= iniReader.ReadBoolean("JA2 Feature Flags", "FF_REBEL_COMMAND", FALSE, FALSE);
+			gGameSettings.fFeatures[FF_STRATEGIC_TRANSPORT_GROUPS]		= iniReader.ReadBoolean("JA2 Feature Flags", "FF_STRATEGIC_TRANSPORT_GROUPS", FALSE, FALSE);
 		}
 	}
 	catch(vfs::Exception)
@@ -725,6 +727,7 @@ BOOLEAN SaveFeatureFlags()
 		settings << "FF_ALLOW_SNOW							= " << (gGameSettings.fFeatures[FF_ALLOW_SNOW] ? "TRUE" : "FALSE") << endl;
 		settings << "FF_MINI_EVENTS							= " << (gGameSettings.fFeatures[FF_MINI_EVENTS] ? "TRUE" : "FALSE") << endl;
 		settings << "FF_REBEL_COMMAND						= " << (gGameSettings.fFeatures[FF_REBEL_COMMAND] ? "TRUE" : "FALSE") << endl;
+		settings << "FF_STRATEGIC_TRANSPORT_GROUPS			= " << (gGameSettings.fFeatures[FF_STRATEGIC_TRANSPORT_GROUPS] ? "TRUE" : "FALSE") << endl;
 
 		try
 		{
@@ -2161,6 +2164,10 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.fAlternativeHelicopterFuelSystem			= iniReader.ReadBoolean("Strategic Gameplay Settings","ALTERNATIVE_HELICOPTER_FUEL_SYSTEM", TRUE);
 	gGameExternalOptions.fHelicopterPassengersCanGetHit				= iniReader.ReadBoolean("Strategic Gameplay Settings","HELICOPTER_PASSENGERS_CAN_GET_HIT", TRUE);
 
+	gGameExternalOptions.fStrategicTransportGroupsDebug				= iniReader.ReadBoolean("Strategic Gameplay Settings", "STRATEGIC_TRANSPORT_GROUPS_DEBUG", FALSE, FALSE);
+	gGameExternalOptions.fStrategicTransportGroupsEnabled			= iniReader.ReadBoolean("Strategic Gameplay Settings", "STRATEGIC_TRANSPORT_GROUPS_ENABLED", FALSE);
+	gGameExternalOptions.iMaxSimultaneousTransportGroups			= iniReader.ReadInteger("Strategic Gameplay Settings", "MAX_SIMULTANEOUS_STRATEGIC_TRANSPORT_GROUPS", 5, 1, 10);
+
 	//################# Morale Settings ##################
 	gGameExternalOptions.sMoraleModAppearance				= iniReader.ReadInteger("Morale Settings","MORALE_MOD_APPEARANCE",				1, 0, 5);
 	gGameExternalOptions.sMoraleModRefinement				= iniReader.ReadInteger("Morale Settings","MORALE_MOD_REFINEMENT",				2, 0, 5);
@@ -4187,6 +4194,8 @@ void LoadRebelCommandSettings()
 	gRebelCommandSettings.iDisruptAsdDuration_Bonus_Nightops = iniReader.ReadInteger("Rebel Command Settings", "DISRUPT_ASD_DURATION_BONUS_NIGHTOPS", 48, 0, 255);
 	gRebelCommandSettings.iDisruptAsdDuration_Bonus_Technician = iniReader.ReadInteger("Rebel Command Settings", "DISRUPT_ASD_DURATION_BONUS_TECHNICIAN", 48, 0, 255);
 
+	gRebelCommandSettings.iForgeTransportOrdersSuccessChance = iniReader.ReadInteger("Rebel Command Settings", "FORGE_TRANSPORT_ORDERS_SUCCESS_CHANCE", 50, 0, 100);
+
 	gRebelCommandSettings.iGetEnemyMovementTargetsSuccessChance = iniReader.ReadInteger("Rebel Command Settings", "STRATEGIC_INTEL_SUCCESS_CHANCE", 50, 0, 100);
 	gRebelCommandSettings.iGetEnemyMovementTargetsDuration = iniReader.ReadInteger("Rebel Command Settings", "STRATEGIC_INTEL_DURATION", 72, 0, 255);
 	gRebelCommandSettings.iGetEnemyMovementTargetsDuration_Bonus_Covert = iniReader.ReadInteger("Rebel Command Settings", "STRATEGIC_INTEL_DURATION_BONUS_COVERT", 48, 0, 255);

GameSettings.h

@@ -181,6 +181,7 @@ enum
 	FF_ALLOW_SNOW,
 	FF_MINI_EVENTS,
 	FF_REBEL_COMMAND,
+	FF_STRATEGIC_TRANSPORT_GROUPS,
 
 	NUM_FEATURE_FLAGS,
 };
@@ -1602,6 +1603,10 @@ typedef struct
 	BOOLEAN fAlternativeHelicopterFuelSystem;
 	BOOLEAN fHelicopterPassengersCanGetHit;
 
+	BOOLEAN fStrategicTransportGroupsDebug;
+	BOOLEAN fStrategicTransportGroupsEnabled;
+	INT8 iMaxSimultaneousTransportGroups;
+
 	UINT16 usHelicopterHoverCostOnGreenTile;
 	UINT16 usHelicopterHoverCostOnRedTile;
 
@@ -1878,6 +1883,8 @@ typedef struct
 	UINT8 iDisruptAsdDuration_Bonus_Nightops;
 	UINT8 iDisruptAsdDuration_Bonus_Technician;
 
+	INT8 iForgeTransportOrdersSuccessChance;
+
 	INT8 iGetEnemyMovementTargetsSuccessChance;
 	UINT8 iGetEnemyMovementTargetsDuration;
 	UINT8 iGetEnemyMovementTargetsDuration_Bonus_Covert;

Laptop/history.cpp

@@ -1259,6 +1259,7 @@ void ProcessHistoryTransactionString(STR16 pString, HistoryUnitPtr pHistory)
 		case HISTORY_SLAY_MYSTERIOUSLY_LEFT:
 		case HISTORY_WALDO:
 		case HISTORY_HELICOPTER_REPAIR_STARTED:
+		case HISTORY_INTERCEPTED_TRANSPORT_GROUP:
 			//swprintf( pString, pHistoryStrings[ pHistory->ubCode ], pHistory->ubSecondCode );
 			swprintf( pString, HistoryName[ pHistory->ubCode ].sHistory, pHistory->ubSecondCode );
 			break;

Laptop/history.h

@@ -113,6 +113,7 @@ enum{
 	HISTORY_MERC_KILLED_CHARACTER,
 	HISTORY_WALDO,
 	HISTORY_HELICOPTER_REPAIR_STARTED,
+	HISTORY_INTERCEPTED_TRANSPORT_GROUP,
 	TEXT_NUM_HISTORY
 };
 

Strategic/Auto Resolve.cpp

@@ -633,6 +633,7 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Autoresolve1");
 	switch( GetEnemyEncounterCode() )
 	{
 		case ENEMY_ENCOUNTER_CODE:
+		case TRANSPORT_INTERCEPT_CODE:
 			gpAR->ubPlayerDefenceAdvantage = 21; //Skewed to the player's advantage for convenience purposes.
 			break;
 		case ENEMY_INVASION_CODE:
@@ -1745,6 +1746,7 @@ void RenderAutoResolve()
 			swprintf( str, gpStrategicString[STR_AR_ATTACK_HEADER] );
 			break;
 		case ENEMY_ENCOUNTER_CODE:
+		case TRANSPORT_INTERCEPT_CODE:
 			swprintf( str, gpStrategicString[STR_AR_ENCOUNTER_HEADER] );
 			break;
 		case ENEMY_INVASION_CODE:
@@ -6058,6 +6060,5 @@ BOOLEAN IndividualMilitiaInUse_AutoResolve( UINT32 aMilitiaId )
 			}
 		}
 	}
-
 	return FALSE;
-}
+}

Strategic/CMakeLists.txt

@@ -47,6 +47,7 @@ set(StrategicSrc
 "${CMAKE_CURRENT_SOURCE_DIR}/Strategic Status.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Strategic Town Loyalty.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/strategic town reputation.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Strategic Transport Groups.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Strategic Turns.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/strategic.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/strategicmap.cpp"

Strategic/Game Event Hook.cpp

@@ -48,6 +48,7 @@
 	#include "LuaInitNPCs.h"	// added by Flugente
 	#include "MiniEvents.h"
 	#include "Rebel Command.h"
+	#include "interface Dialogue.h"
 
 #include "connect.h"
 
@@ -668,6 +669,11 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
 		case EVENT_REBELCOMMAND:
 			RebelCommand::HandleStrategicEvent(pEvent->uiParam);
 			break;
+
+		case EVENT_RETURN_TRANSPORT_GROUP:
+			// for this action, we only care about the groupid, which is in the event param
+			ExecuteStrategicAIAction(NPC_ACTION_RETURN_TRANSPORT_GROUP, 0, 0, pEvent->uiParam);
+			break;
 	}
 	gfPreventDeletionOfAnyEvent = fOrigPreventFlag;
 	return TRUE;

Strategic/Game Event Hook.h

@@ -154,6 +154,9 @@ enum
 
 	EVENT_REBELCOMMAND,
 
+	EVENT_RETURN_TRANSPORT_GROUP,
+	EVENT_TRANSPORT_GROUP_DEFEATED,
+
 	NUMBER_OF_EVENT_TYPES_PLUS_ONE,
 	NUMBER_OF_EVENT_TYPES						= NUMBER_OF_EVENT_TYPES_PLUS_ONE - 1
 };
@@ -217,4 +220,4 @@ void DeleteAllStrategicEvents();
 // Flugente: return vector of all events of type ubCallbackID with time and param
 std::vector< std::pair<UINT32, UINT32> > GetAllStrategicEventsOfType( UINT8 ubCallbackID );
 
-#endif
+#endif

Strategic/Game Events.cpp

@@ -137,6 +137,7 @@ CHAR16 gEventName[NUMBER_OF_EVENT_TYPES_PLUS_ONE][40]={
 	L"ArmyFinishTraining",
 	L"MiniEvent",
 	L"ARC_Event",
+	L"ReturnTransportGroup",
 };
 
 #endif

Strategic/Map Screen Interface Map.cpp

@@ -46,6 +46,7 @@
 	#include "LuaInitNPCs.h"	// added by Flugente
 	#include "Game Event Hook.h"	// added by Flugente
 	#include "Rebel Command.h"
+	#include "Strategic Transport Groups.h"
 
 #include "Quests.h"
 #include "connect.h"
@@ -841,6 +842,8 @@ void fillMapColoursForVisitedSectors(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINAT
 		}
 	}
 
+	FillMapColoursForTransportGroups(colorMap);
+
 	if (RebelCommand::ShowEnemyMovementTargets())
 	{
 		const auto targetColor = MAP_SHADE_LT_RED;
@@ -8584,6 +8587,25 @@ void DetermineMapIntelData( INT32 asSectorZ )
 			}
 		}
 
+		// transport groups
+		std::map<UINT8, TransportGroupSectorInfo> map = GetTransportGroupSectorInfo();
+		for (const auto iter : map)
+		{
+			CHAR16 str[128];
+
+			switch (iter.second)
+			{
+			case TransportGroupSectorInfo::TransportGroupSectorInfo_LocatedGroup:
+				swprintf( str, gpStrategicString[STR_PB_TRANSPORT_GROUP]);
+				break;
+
+			case TransportGroupSectorInfo::TransportGroupSectorInfo_LocatedDestination:
+				swprintf( str, gpStrategicString[STR_PB_TRANSPORT_GROUP_EN_ROUTE]);
+				break;
+			}
+			AddIntelAndQuestMapDataForSector( SECTORX(iter.first), SECTORY(iter.first), MAP_SHADE_LT_YELLOW, -1, str, L"" );
+		}
+
 		// uncovered terrorists we know of
 		for ( int cnt = 0; cnt < 6; ++cnt )
 		{

Strategic/PreBattle Interface.cpp

@@ -47,6 +47,7 @@
 	#include "CampaignStats.h"				// added by Flugente
 	#include "militiasquads.h"				// added by Flugente
 	#include "SkillCheck.h"					// added by Flugente
+	#include "Strategic Transport Groups.h"
 
 #ifdef JA2UB
 #include "ub_config.h"
@@ -438,7 +439,7 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 		}
 		else if ( pBattleGroup && pBattleGroup->usGroupTeam != OUR_TEAM && NumNonPlayerTeamMembersInSector( pBattleGroup->ubSectorX, pBattleGroup->ubSectorY, MILITIA_TEAM ) > 0 )
 		{
-			SetEnemyEncounterCode( ENEMY_ENCOUNTER_CODE );
+			SetEnemyEncounterCode( pBattleGroup->usGroupTeam == ENEMY_TEAM && pBattleGroup->pEnemyGroup->ubIntention == TRANSPORT ? TRANSPORT_INTERCEPT_CODE : ENEMY_ENCOUNTER_CODE );
 		}
 		else if( GetEnemyEncounterCode() == ENTERING_ENEMY_SECTOR_CODE ||
 			GetEnemyEncounterCode() == ENEMY_ENCOUNTER_CODE ||
@@ -452,7 +453,8 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 			GetEnemyEncounterCode() == CONCEALINSERTION_CODE ||
 			GetEnemyEncounterCode() == BLOODCAT_ATTACK_CODE ||
 			GetEnemyEncounterCode() == ZOMBIE_ATTACK_CODE ||
-			GetEnemyEncounterCode() == BANDIT_ATTACK_CODE )
+			GetEnemyEncounterCode() == BANDIT_ATTACK_CODE ||
+			GetEnemyEncounterCode() == TRANSPORT_INTERCEPT_CODE )
 		{
 			//use same code
 			SetExplicitEnemyEncounterCode( GetEnemyEncounterCode() );
@@ -679,8 +681,24 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 				{
 					SetEnemyEncounterCode( ENEMY_ENCOUNTER_CODE );
 
+					GROUP* pGroup = gpGroupList;
+					BOOLEAN encounteredTransportGroup = FALSE;
+					while (pGroup)
+					{
+						if (pGroup->usGroupTeam == ENEMY_TEAM && pGroup->pEnemyGroup->ubIntention == TRANSPORT && pGroup->ubSectorX == gpBattleGroup->ubSectorX && pGroup->ubSectorY == gpBattleGroup->ubSectorY && pGroup->ubSectorZ == gpBattleGroup->ubSectorZ)
+						{
+							encounteredTransportGroup = TRUE;
+							break;
+						}
+
+						pGroup = pGroup->next;
+					}
+					if (encounteredTransportGroup)
+					{
+						SetEnemyEncounterCode( TRANSPORT_INTERCEPT_CODE );
+					}
 					// Flugente: no ambushes on an airdrop
-					if ( !fAirDrop )
+					else if ( !fAirDrop )
 					{
 						//Don't consider ambushes until the player has reached 25% (normal) progress
 						if( gfHighPotentialForAmbush )
@@ -798,7 +816,9 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 		}
 		else
 		{ //Are enemies invading a town, or just encountered the player.
-			if( GetTownIdForSector( gubPBSectorX, gubPBSectorY ) )
+			if (pBattleGroup && pBattleGroup->usGroupTeam == ENEMY_TEAM && pBattleGroup->pEnemyGroup->ubIntention == TRANSPORT)
+				SetEnemyEncounterCode( TRANSPORT_INTERCEPT_CODE );
+			else if( GetTownIdForSector( gubPBSectorX, gubPBSectorY ) )
 				SetEnemyEncounterCode( ENEMY_INVASION_CODE );
 			//SAM sites not in towns will also be considered to be important
 			else if( pSector->uiFlags & SF_SAM_SITE )
@@ -866,7 +886,7 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 	}
 	HideButton( giMapContractButton );
 
-	if( GetEnemyEncounterCode() == ENEMY_ENCOUNTER_CODE )
+	if( GetEnemyEncounterCode() == ENEMY_ENCOUNTER_CODE || GetEnemyEncounterCode() == TRANSPORT_INTERCEPT_CODE )
 	{ //we know how many enemies are here, so until we leave the sector, we will continue to display the value.
 		//the flag will get cleared when time advances after the fEnemyInSector flag is clear.
 
@@ -955,6 +975,7 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 		{
 			case CREATURE_ATTACK_CODE:
 			case ENEMY_ENCOUNTER_CODE:
+			case TRANSPORT_INTERCEPT_CODE:
 			case ENEMY_INVASION_CODE:
 			case ENEMY_INVASION_AIRDROP_CODE:
 			case BLOODCAT_ATTACK_CODE:
@@ -1213,6 +1234,7 @@ void RenderPBHeader( INT32 *piX, INT32 *piWidth)
 			swprintf( str, gpStrategicString[ STR_PB_ENEMYINVASION_HEADER ] );
 			break;
 		case ENEMY_ENCOUNTER_CODE:
+		case TRANSPORT_INTERCEPT_CODE:
 			swprintf( str, gpStrategicString[ STR_PB_ENEMYENCOUNTER_HEADER ] );
 			break;
 		case ENEMY_AMBUSH_CODE:
@@ -2520,6 +2542,10 @@ void LogBattleResults( UINT8 ubVictoryCode)
 				break;
 			case CONCEALINSERTION_CODE:
 				break;
+			case TRANSPORT_INTERCEPT_CODE:
+				AddHistoryToPlayersLog( HISTORY_INTERCEPTED_TRANSPORT_GROUP, 0, GetWorldTotalMin(), sSectorX, sSectorY );
+				NotifyTransportGroupDefeated();
+				break;
 		}
 
 		// Flugente: campaign stats
@@ -2534,6 +2560,7 @@ void LogBattleResults( UINT8 ubVictoryCode)
 				AddHistoryToPlayersLog( HISTORY_LOSTTOWNSECTOR, 0, GetWorldTotalMin(), sSectorX, sSectorY );
 				break;
 			case ENEMY_ENCOUNTER_CODE:
+			case TRANSPORT_INTERCEPT_CODE:
 				AddHistoryToPlayersLog( HISTORY_LOSTBATTLE, 0, GetWorldTotalMin(), sSectorX, sSectorY );
 				break;
 			case ENEMY_AMBUSH_CODE:
@@ -2567,6 +2594,7 @@ void LogBattleResults( UINT8 ubVictoryCode)
 			gCurrentIncident.usIncidentFlags |= INCIDENT_ATTACK_ENEMY;
 			break;
 		case ENEMY_ENCOUNTER_CODE:
+		case TRANSPORT_INTERCEPT_CODE:
 		case ENTERING_ENEMY_SECTOR_CODE:
 		case CREATURE_ATTACK_CODE:
 		case ENTERING_BLOODCAT_LAIR_CODE:

Strategic/PreBattle Interface.h

@@ -47,6 +47,8 @@ enum
 	BLOODCAT_ATTACK_CODE,			// Flugente: like CREATURE_ATTACK_CODE, but with cats
 	ZOMBIE_ATTACK_CODE,				// Flugente: like CREATURE_ATTACK_CODE, but with zombies
 	BANDIT_ATTACK_CODE,				// Flugente: like CREATURE_ATTACK_CODE, but with bandits
+
+	TRANSPORT_INTERCEPT_CODE,		// rftr: like ENEMY_ENCOUNTER_CODE
 };
 
 extern BOOLEAN gfAutoAmbush;
@@ -112,4 +114,4 @@ enum
 };
 void LogBattleResults( UINT8 ubVictoryCode);
 
-#endif
+#endif