use UnitState.aTraversals

Author: Whakomatic

X2WOTCCommunityHighlander/Src/XComGame/Classes/XComGameState_Unit.uc

@@ -291,7 +291,8 @@ var() TAppearance           kAppearance;
 /**
  *  THESE VARS HAVE BEEN COPIED FROM TCharacter AND ARE NOT REFACTORED YET
  */
-var() protected int         aTraversals[ETraversalType.EnumCount]<FGDEIgnore=true>;
+// HL-Docs: ref:AIHazardEscape; issue:1559
+var() /* protected */ int         aTraversals[ETraversalType.EnumCount]<FGDEIgnore=true>;
 
 /**
  *  END TCharacter VARS

X2WOTCCommunityHighlander/Src/XComGame/Classes/XGAIBehavior.uc

@@ -8631,9 +8631,9 @@ simulated function bool MoveToPoint(vector vDestination, optional out string Fai
 	local TTile kTileDest;
 	local array<PathPoint> PathPoints;
 	local array<ETraversalType> AllowedTraversals;
+	local bool bNeedsHazardEscape;
 
 	bPathFailed=false;
-
 	kTileDest = `XWORLD.GetTileCoordinatesFromPosition(vDestination);
 
 	if (kTileDest.X == UnitState.TileLocation.X && kTileDest.Y == UnitState.TileLocation.Y && abs(UnitState.TileLocation.Z-kTileDest.Z) <= 3)
@@ -8651,8 +8651,9 @@ simulated function bool MoveToPoint(vector vDestination, optional out string Fai
 	}
 
 	// HL-Docs: ref:AIHazardEscape; issue:1559
-	// IsTileReachable will always return false if surrounded by hazards
-	if (!bPathFailed && !NeedsHazardEscape())
+	// IsTileReachable will always return false if surrounded by hazards, so skip this check
+	bNeedsHazardEscape = NeedsHazardEscape();
+	if (!bPathFailed && !bNeedsHazardEscape)
 	{
 		bPathFailed = !m_kUnit.m_kReachableTilesCache.IsTileReachable(kTileDest);
 		if (bPathFailed)
@@ -8661,33 +8662,34 @@ simulated function bool MoveToPoint(vector vDestination, optional out string Fai
 		}
 	}
 
-	if( !bPathFailed || bForcePathIfUnreachable || NeedsHazardEscape() )
+	if( !bPathFailed || bForcePathIfUnreachable || bNeedsHazardEscape )
 	{
 		if (XGAIBehavior_Civilian(self) != none)
 		{
 			XGAIBehavior_Civilian(self).m_iMoveTimeStart = WorldInfo.TimeSeconds;
 		}
 
 		// HL-Docs: ref:AIHazardEscape; issue:1559
-		// Use BuildNonUnitPath for hazard escape to ensure the unit can path out of hazards
-		if (NeedsHazardEscape())
-		{
-			// Build allowed traversals from unit's character template
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_Normal) AllowedTraversals.AddItem(eTraversal_Normal);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_ClimbOver) AllowedTraversals.AddItem(eTraversal_ClimbOver);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_ClimbOnto) AllowedTraversals.AddItem(eTraversal_ClimbOnto);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_ClimbLadder) AllowedTraversals.AddItem(eTraversal_ClimbLadder);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_DropDown) AllowedTraversals.AddItem(eTraversal_DropDown);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_Grapple) AllowedTraversals.AddItem(eTraversal_Grapple);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_Landing) AllowedTraversals.AddItem(eTraversal_Landing);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_BreakWindow) AllowedTraversals.AddItem(eTraversal_BreakWindow);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_KickDoor) AllowedTraversals.AddItem(eTraversal_KickDoor);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_JumpUp) AllowedTraversals.AddItem(eTraversal_JumpUp);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_WallClimb) AllowedTraversals.AddItem(eTraversal_WallClimb);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_BreakWall) AllowedTraversals.AddItem(eTraversal_BreakWall);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_Launch) AllowedTraversals.AddItem(eTraversal_Launch);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_Flying) AllowedTraversals.AddItem(eTraversal_Flying);
-			if (UnitState.GetMyTemplate().bCanUse_eTraversal_Land) AllowedTraversals.AddItem(eTraversal_Land);
+		// Use BuildNonUnitPath to path through hazards with runtime traversal capabilities
+		if (bNeedsHazardEscape)
+		{
+			// Build allowed traversals from unit's runtime traversal capabilities
+			if (UnitState.aTraversals[eTraversal_Normal] > 0) AllowedTraversals.AddItem(eTraversal_Normal);
+			if (UnitState.aTraversals[eTraversal_ClimbOver] > 0) AllowedTraversals.AddItem(eTraversal_ClimbOver);
+			if (UnitState.aTraversals[eTraversal_ClimbOnto] > 0) AllowedTraversals.AddItem(eTraversal_ClimbOnto);
+			if (UnitState.aTraversals[eTraversal_ClimbLadder] > 0) AllowedTraversals.AddItem(eTraversal_ClimbLadder);
+			if (UnitState.aTraversals[eTraversal_DropDown] > 0) AllowedTraversals.AddItem(eTraversal_DropDown);
+			if (UnitState.aTraversals[eTraversal_Grapple] > 0) AllowedTraversals.AddItem(eTraversal_Grapple);
+			if (UnitState.aTraversals[eTraversal_Landing] > 0) AllowedTraversals.AddItem(eTraversal_Landing);
+			if (UnitState.aTraversals[eTraversal_BreakWindow] > 0) AllowedTraversals.AddItem(eTraversal_BreakWindow);
+			if (UnitState.aTraversals[eTraversal_KickDoor] > 0) AllowedTraversals.AddItem(eTraversal_KickDoor);
+			if (UnitState.aTraversals[eTraversal_JumpUp] > 0) AllowedTraversals.AddItem(eTraversal_JumpUp);
+			if (UnitState.aTraversals[eTraversal_WallClimb] > 0) AllowedTraversals.AddItem(eTraversal_WallClimb);
+			if (UnitState.aTraversals[eTraversal_Phasing] > 0) AllowedTraversals.AddItem(eTraversal_Phasing);
+			if (UnitState.aTraversals[eTraversal_BreakWall] > 0) AllowedTraversals.AddItem(eTraversal_BreakWall);
+			if (UnitState.aTraversals[eTraversal_Launch] > 0) AllowedTraversals.AddItem(eTraversal_Launch);
+			if (UnitState.aTraversals[eTraversal_Flying] > 0) AllowedTraversals.AddItem(eTraversal_Flying);
+			if (UnitState.aTraversals[eTraversal_Land] > 0) AllowedTraversals.AddItem(eTraversal_Land);
 			class'X2PathSolver'.static.BuildNonUnitPath(UnitState.TileLocation, kTileDest, AllowedTraversals, Path);
 		}
 		else