epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improves observer camera focus fallback when the player's (or bot's) Construction Yard is destroyed

Browse Source 
Currently, when an observer clicks on a player's name in the stats panel, the camera centers on that player's Construction Yard. However, if the Construction Yard has been destroyed, the click does nothing.

This commit searches for the Construction Yard, then a MCV, then any remaining building.
This commit is contained in:
xan2622
2026-01-04 03:08:04 +01:00
committed by Gustas Kažukauskas
parent a6c58c0f68
commit 156122f9e3
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -546,12 +546,32 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
return ScrollItemWidget.Setup(template, () => false, () =>
{
var playerBase = world.ActorsHavingTrait<BaseBuilding>().FirstOrDefault(a => !a.IsDead && a.Owner == player);
if (playerBase != null)
worldRenderer.Viewport.Center(playerBase.CenterPosition);
var targetActor = FindPlayerBaseActor(player);
if (targetActor != null)
worldRenderer.Viewport.Center(targetActor.CenterPosition);
});
}
Actor FindPlayerBaseActor(Player player)
{
// Priority 1: Primary BaseBuilding (Construction Yard or MCV), closest to viewport
var primaryBase = world.ActorsHavingTrait<BaseBuilding>()
.Where(a => a.Owner == player)
.OrderByDescending(a => a.IsPrimaryBuilding())
.ThenBy(a => (worldRenderer.Viewport.CenterPosition - a.CenterPosition).LengthSquared)
.FirstOrDefault();
if (primaryBase != null)
return primaryBase;
// Priority 2: Any selectable Building (fallback), closest to viewport
var building = world.ActorsHavingTrait<Building>()
.OrderBy(a => (worldRenderer.Viewport.CenterPosition - a.CenterPosition).LengthSquared)
.FirstOrDefault(a => a.Owner == player && a.Info.HasTraitInfo<SelectableInfo>());
return building;
}
void AdjustStatisticsPanel(Widget itemTemplate)
{
var height = playerStatsPanel.Bounds.Height;