Fix Missing Narratives

Author: BlackDog86

X2WOTCCommunityHighlander/Src/XComGame/Classes/X2Action_RevealAIBegin.uc

@@ -715,8 +715,13 @@ Begin:
 
 			if( RevealContext.FirstSightingMoment != none )
 			{
-				`PRESBASE.UINarrative(RevealContext.FirstSightingMoment);
-				Sleep(FirstSightedDelay * GetDelayModifier());
+				// Start Issue #1492 - Only play the narrative moment on reveal / scamper if it has not been played before
+				if(RevealContext.FirstSightingMoment.AmbientMaxPlayCount == 0 || `PRESBASE.GetTimesPlayed(RevealContext.FirstSightingMoment) < RevealContext.FirstSightingMoment.AmbientMaxPlayCount)
+				{
+					`PRESBASE.UINarrative(RevealContext.FirstSightingMoment);
+					Sleep(FirstSightedDelay * GetDelayModifier());
+				}
+				// End Issue #1492
 			}
 
 			//Play a narrative moment for sighting this type of enemy

X2WOTCCommunityHighlander/Src/XComGame/Classes/XComGameState_BattleData.uc

@@ -1335,7 +1335,12 @@ function CheckFirstSightingOfSpecificEnemyFromViewer( XComGameState_Unit Sighted
 	local X2CharacterTemplate CharacterTemplate;
 	local XComGameState_HeadquartersXCom XComHQ;
 	local int i;
-	local bool bPlayFirstSighting;
+	local bool bPlayFirstSighting, bNarrativeAlreadyPlayed;
+	// Variables for Issue #1492
+	local XComNarrativeMoment SightedNarrative;
+	local XComGameState_LadderProgress LadderData;
+
+	LadderData = XComGameState_LadderProgress(`XCOMHISTORY.GetSingleGameStateObjectForClass( class'XComGameState_LadderProgress', true ) );
 
 	if( ViewingUnitState != none )
 	{
@@ -1353,11 +1358,43 @@ function CheckFirstSightingOfSpecificEnemyFromViewer( XComGameState_Unit Sighted
 				if( `CHEATMGR == none || !`CHEATMGR.DisableFirstEncounterVO )
 				{
 					bPlayFirstSighting = false;
+					bNarrativeAlreadyPlayed = false;
 
 					if( GroupLeaderUnitState.IsAlive() )
 					{
 						XComHQ = XComGameState_HeadquartersXCom(History.GetSingleGameStateObjectForClass(class'XComGameState_HeadquartersXCom', true));
-						bPlayFirstSighting = (XComHQ != None) && !XComHQ.HasSeenCharacterTemplate(CharacterTemplate) && !CharacterTemplate.bNeverShowFirstSighted;
+						// Begin Issue #1492
+						/// HL-Docs: ref:Bugfixes; issue:1492
+						/// First, we get the 'first-sighted' narrative moment from the group leader character template. Then, we adjust bPlayFirstSighting 
+						/// to only return true when a narrative moment exists and has not been played already. This reduces the downstream visualizer delay
+						/// to 1 second when XCom discovers a new type of unit while scouting but there is no narrative moment to play. This allows the 
+						/// playing of previously disabled narrative moments, whilst preserving the overall visualization outcome.
+						if (LadderData != none)
+						{
+							if (CharacterTemplate.SightedNarrativeMoments.Length > 1)
+							{
+								SightedNarrative = CharacterTemplate.SightedNarrativeMoments[1];
+								if(SightedNarrative.AmbientMaxPlayCount != 0 && `PRESBASE.GetTimesPlayed(SightedNarrative) >= SightedNarrative.AmbientMaxPlayCount)
+								{
+									bNarrativeAlreadyPlayed = true;
+								}
+							}
+						}
+						else if (CharacterTemplate.SightedNarrativeMoments.Length > 0)
+						{
+							SightedNarrative = CharacterTemplate.SightedNarrativeMoments[0];
+							if(SightedNarrative.AmbientMaxPlayCount != 0 && `PRESBASE.GetTimesPlayed(SightedNarrative) >= SightedNarrative.AmbientMaxPlayCount)
+							{
+								bNarrativeAlreadyPlayed = true;
+							}
+						}
+						else
+						{
+							// There are no sighted narrative moments listed on the character template
+							bNarrativeAlreadyPlayed = true;
+						}
+						bPlayFirstSighting = (XComHQ != None) && !XComHQ.HasSeenCharacterTemplate(CharacterTemplate) && !CharacterTemplate.bNeverShowFirstSighted && !bNarrativeAlreadyPlayed;						
+						// End Issue #1492
 					}
 
 					// If this group has not scampered OR the character template hasn't been seen before, 

X2WOTCCommunityHighlander/Src/XComGame/Classes/XComGameState_HeadquartersXCom.uc

@@ -9117,16 +9117,18 @@ function UpdateGameBoard()
 	super.UpdateGameBoard();
 }
 
+// Begin Issue #1492 - Adjust AddSeenCharacterTemplate & HasSeenCharacterTemplate to use individual template names
+// instead of character group names - changed to allow different narrative moments to be played on units in the same group
 function AddSeenCharacterTemplate(X2CharacterTemplate CharacterTemplate)
 {
-	SeenCharacterTemplates.AddItem(CharacterTemplate.CharacterGroupName);
+	SeenCharacterTemplates.AddItem(CharacterTemplate.DataName);
 }
 
 function bool HasSeenCharacterTemplate(X2CharacterTemplate CharacterTemplate)
 {
-	return (SeenCharacterTemplates.Find(CharacterTemplate.CharacterGroupName) != INDEX_NONE);
+	return (SeenCharacterTemplates.Find(CharacterTemplate.DataName) != INDEX_NONE);
 }
-
+// End Issue #1492
 function XComGameState_WorldRegion GetRegionByName(Name RegionTemplateName)
 {
 	local XComGameStateHistory History;