Fix X2AllowSelectAll

Author: BlackDog86

X2WOTCCommunityHighlander/Config/XComGame.ini

@@ -321,3 +321,10 @@ InterruptionsUpdateTurnStartLocation = false			; Should interruptions update tur
 InterruptionsResetPanicTestsPerformedThisTurn = false	; Should interruptions reset the tracker for the amount of panic tests performed this turn, just like a normal turn?	Default is false, because the unit isn't taking a typical turn.
 InterruptionsTriggerGroupTurnBegunEvent = true			; Should interruptions trigger the GroupTurnBegunEvent, just like what happens in a normal turn.						Default is true, because interruptions work closely with "groups" (XComGameState_AIGroup) in the code side of things.
 ; End Issue #1325
+
+; Start Issue #1486
+;Uncomment to exclude civilians from being selected in the X2AllowSelectAll Console Command
+;ExcludeCiviliansFromX2AllowSelectAll = true
+;Uncomment to alert & scamper all aliens when using X2AllowSelectAll - allows all alien units to move normally
+;UseImprovedX2AllowSelectAllBehavior = true
+; End Issue #1486

X2WOTCCommunityHighlander/Src/XComGame/Classes/CHHelpers.uc

@@ -286,6 +286,19 @@ var config bool bDisableAutomaticPromotionPhoto;
 var config bool bDisableAutomaticBondPhoto;
 // End Issue #1453
 
+// Start Issue #1486
+/// HL-Docs: ref:Bugfixes; issue:1486
+/// This set of changes fixes seveal issues with the behavior of the debugging console command X2AllowSelectAll - in particular:
+/// 1. With the command active, when selecting units non on the XCom team, the camera would not pan to those units
+/// 2. When carrying out other debug commands on non-XCom units (e.g. grantactionpoints), the camera would pan back to the first active unit on the player team
+/// 3. Turns which were ended while the command was active would not be processed properly
+/// 4. Non-XCom units would not move correctly when the command was issued due to XCom not being considered visible (game resorts to AI-like patrol behavior)
+/// All of these are now fixed in a minimally invasive way by gating small setions of basegame code when the command is active and will have no effect otherwise
+/// Disabling selection of civilians & 'Improved Behavior' (scamper & alert all aliens) are also provided as optional flags to improve the overall experience. 
+var config bool ExcludeCiviliansFromX2AllowSelectAll;
+var config bool UseImprovedX2AllowSelectAllBehavior;
+// End Issue #1486
+
 // Start Issue #885
 enum EHLDelegateReturn
 {

X2WOTCCommunityHighlander/Src/XComGame/Classes/X2Camera_FollowMouseCursor.uc

@@ -65,9 +65,12 @@ function Activated(TPOV CurrentPOV, X2Camera PreviousActiveCamera, X2Camera_Look
 	{
 		History = `XCOMHISTORY;
 		ActiveUnit = XComGameState_Unit(History.GetGameStateForObjectID(LocalController.GetActiveUnitStateRef().ObjectID));
+		// Begin Issue #1486 - Allow the default camera to pan to units owned by the AI when the X2AllowSelectAll command is used
 		if(ActiveUnit != none 
-			&& !ActiveUnit.ControllingPlayerIsAI() 
-			&& ActiveUnit.ControllingPlayer == GetActivePlayer())
+			&& ((!ActiveUnit.ControllingPlayerIsAI() 
+			&& ActiveUnit.ControllingPlayer == GetActivePlayer()) 
+			|| (`CHEATMGR != None && `CHEATMGR.bAllowSelectAll)))
+		// End Issue #1486
 		{
 			CenterOnUnitIfOffscreen(ActiveUnit);
 		}
@@ -113,9 +116,12 @@ function EventListenerReturn OnCameraFocusUnit(Object EventData, Object EventSou
 	{
 		History = `XCOMHISTORY;
 		ActiveUnit = XComGameState_Unit(History.GetGameStateForObjectID(LocalController.GetActiveUnitStateRef().ObjectID));
+		// Begin Issue #1486 - Allow the default camera to pan to units owned by the AI when the X2AllowSelectAll command is used
 		if(ActiveUnit != none 
-			&& !ActiveUnit.ControllingPlayerIsAI() 
-			&& ActiveUnit.ControllingPlayer == GetActivePlayer())
+			&& ((!ActiveUnit.ControllingPlayerIsAI() 
+			&& ActiveUnit.ControllingPlayer == GetActivePlayer()) 
+			|| (`CHEATMGR != None && `CHEATMGR.bAllowSelectAll)))
+		// End Issue #1486
 		{
 			CenterOnUnitIfOffscreen(ActiveUnit);
 		}
@@ -310,8 +316,8 @@ event OnActiveUnitChanged(XComGameState_Unit NewActiveUnit)
 	super.OnActiveUnitChanged(NewActiveUnit);
 
 	MoveAbilitySubmitted = false;
-
-	if( NewActiveUnit.IsPlayerControlled() )
+	// Single Line for Issue #1486 - Allow the camera to focus on non-player controlled units when X2AllowSelectAll is used
+	if( NewActiveUnit.IsPlayerControlled() || (`CHEATMGR != None && `CHEATMGR.bAllowSelectAll))
 	{
 		CenterOnUnitIfOffscreen(NewActiveUnit);
 		LastPlayerControlledUnit = NewActiveUnit;
@@ -429,7 +435,12 @@ function EventListenerReturn OnAbilityActivated(Object EventData, Object EventSo
 		if (AbilityContext.InputContext.AbilityTemplateName == 'StandardMove')
 		{
 			UnitState = XComGameState_Unit(`XCOMHISTORY.GetGameStateForObjectID(AbilityContext.InputContext.SourceObject.ObjectID));
-			if (UnitState != none && !UnitState.ControllingPlayerIsAI() && UnitState.ControllingPlayer == GetActivePlayer())
+			// Begin Issue #1486 - Allow the default camera to pan to units owned by the AI when the X2AllowSelectAll command is used
+			if (UnitState != none 
+			&& ((!UnitState.ControllingPlayerIsAI() 
+			&& UnitState.ControllingPlayer == GetActivePlayer())
+			|| (`CHEATMGR != None && `CHEATMGR.bAllowSelectAll)))				
+			// End Issue #1486
 			{
 				// A move action was just submitted, will cause disabling of focuspointexpiry so building vis doesnt fluctuate
 				//while we are waiting for the camera to switch to the follow moving unit camera

X2WOTCCommunityHighlander/Src/XComGame/Classes/X2TacticalGameRuleset.uc

@@ -5059,8 +5059,11 @@ simulated state TurnPhase_UnitActions
 		if( bActionsAvailable )
 		{
 			bWaitingForNewStates = true;	//If there are actions available, indicate that we are waiting for a decision on which one to take
-
-			if( !UnitActionPlayerIsRemote() )
+			// Single Line for Issue #1486 - When using X2AllowSelectAll, we need to bypass the reselection of the player visualizer when
+			// a new gamestate is submitted but the unit we're controlling (which may not belong to us) still has actions left -
+			// this prevents the game from 'tabbing away' from units which are not on our team but which we may still may be controlling.
+			// This is most obvious when issuing debug commands such as ttc / giveactionpoints
+			if( !UnitActionPlayerIsRemote() && (`CHEATMGR == none || !`CHEATMGR.bAllowSelectAll))
 			{				
 				PlayerState = XComGameState_Player(CachedHistory.GetGameStateForObjectID(UnitState.ControllingPlayer.ObjectID));
 				`assert(PlayerState != none);

X2WOTCCommunityHighlander/Src/XComGame/Classes/XComTacticalCheatManager.uc

@@ -3949,10 +3949,22 @@ exec function X2AllowSelectAll(bool bSetting)
 	if( bSetting && `XWORLD.bDebugEnableFOW )
 	{
 		ToggleFOW();
+		// Begin Issue #1486 - Force visibility to allow proper pathing of alien units
+		// (They will still walk if not activated / alerted)
+		ForceAllUnitsVisible = true;		
+		// Improved functionality alerts and scampers, breaking the default patrol mechanics and allowing the units to move normally
+		if(class'CHHelpers'.default.UseImprovedX2AllowSelectAllBehavior == true)
+		{
+			ToggleIndividualConcealment();
+			X2DebugPodReveals();
+		}
+		// End Issue #1486
 	}
 	else if ( bSetting && !`XWORLD.bDebugEnableFOW )
 	{
 		ToggleFOW();
+		// Single Line for Isuee #1486 - Turn off forced visibility if we're also turning the FOW back on
+		ForceAllUnitsVisible  = false;
 	}
 
 	//Force all units to be visible

X2WOTCCommunityHighlander/Src/XComGame/Classes/XComTacticalController.uc

@@ -574,9 +574,15 @@ simulated function bool Visualizer_CycleToNextAvailableUnit(int Direction)
 		// Force all units to be selectable regardless of action points, if AllowSelectAll is on.
 		if ((`CHEATMGR != None && `CHEATMGR.bAllowSelectAll))
 		{
-			bActionsAvailable = true;
+			if(class'CHHelpers'.default.ExcludeCiviliansFromX2AllowSelectall && SelectNewUnit.GetTeam() == eTeam_Neutral)
+			{
+				bActionsAvailable = false;
+			}
+			else			
+			{
+				bActionsAvailable = true;
+			}
 		}
-
 		if( bActionsAvailable && Visualizer_SelectUnit(SelectNewUnit) )
 		{
 			return true;
@@ -1373,7 +1379,12 @@ function bool GameStateMoveUnit(XGUnit kUnit,
 // ---------------------------------------------------------------------
 simulated function bool PerformEndTurn(EPlayerEndTurnType eEndTurnType)
 {
-	// Aural feedback for player input
+	// Single Line for Issue #1486 - When ending the turn, switch off bAllowSelectAll to allow the AI to process the alien turn normally
+	// This maintains the previous FOW and Unit Visibility selections from X2AllowSelectAll
+	`CHEATMGR.bAllowSelectAll = false;
+
+	// Aural feedback for player input	
+
 	if(eEndTurnType == ePlayerEndTurnType_PlayerInput)
 	{
 		PlaySound(SoundCue'SoundUI.PositiveUISelctionCue', true, true);

X2WOTCCommunityHighlander/Src/XComGame/Classes/XComTacticalInput.uc

@@ -2884,7 +2884,8 @@ state ActiveUnit_Moving
 
 		bChangeUnitSuccess = false;
 		bHandled = false;
-		if( XComTacticalController(Outer).m_XGPlayer.m_eTeam == kTargetedUnit.m_eTeam ) 
+		// Single Line for Issue #1486 - Left click now allows selection of units that don't belong to the player when X2AllowSelectAll is used
+		if( XComTacticalController(Outer).m_XGPlayer.m_eTeam == kTargetedUnit.m_eTeam || (`CHEATMGR != none && `CHEATMGR.bAllowSelectAll))
 		{
 			//`log("Want to target: " $ kTargetedUnit.GetHumanReadableName(),,'uixcom');