Switch to observer ui on victory/defeat (Feature #1002).

OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj

@@ -105,6 +105,7 @@
     <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
     <Compile Include="Widgets\ToggleButtonWidget.cs" />
     <Compile Include="Widgets\Logic\CncColorPickerLogic.cs" />
+    <Compile Include="Widgets\LogicTickerWidget.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs

@@ -22,16 +22,16 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 	{
 		enum MenuType { None, Cheats }
 		MenuType menu = MenuType.None;
-		
+
 		Widget ingameRoot;
 		ProductionTabsWidget queueTabs;
 		World world;
-		
+
 		void AddChatLine(Color c, string from, string text)
 		{
 			ingameRoot.GetWidget<ChatDisplayWidget>("CHAT_DISPLAY").AddLine(c, from, text);
 		}
-		
+
 		public void UnregisterEvents()
 		{
 			Game.AddChatLine -= AddChatLine;
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				world.ActorRemoved += queueTabs.ActorChanged;
 			}
 		}
-		
+
 		void SetupProductionGroupButton(ToggleButtonWidget button, string group)
 		{
 			Action<bool> selectTab = reverse =>
@@ -63,7 +63,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			icon.GetImageName = () => button.IsDisabled() ? chromeName+"-disabled" :
 				queueTabs.Groups[group].Alert ? chromeName+"-alert" : chromeName;
 		}
-		
+
 		[ObjectCreator.UseCtor]
 		public CncIngameChromeLogic([ObjectCreator.Param] Widget widget,
 		                            [ObjectCreator.Param] World world )
@@ -71,97 +71,101 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			this.world = world;
 			world.WorldActor.Trait<CncMenuPaletteEffect>()
 				.Fade(CncMenuPaletteEffect.EffectType.None);
-			
+
 			Game.AddChatLine += AddChatLine;
 			Game.BeforeGameStart += UnregisterEvents;
-			
+
 			ingameRoot = widget.GetWidget("INGAME_ROOT");
 			var playerRoot = ingameRoot.GetWidget("PLAYER_ROOT");
-			
-			Action onOptionsClick = () =>
-			{
-				if (menu != MenuType.None)
-				{
-					Widget.CloseWindow();
-					menu = MenuType.None;
-				}
-
-				ingameRoot.IsVisible = () => false;
-				Game.LoadWidget(world, "INGAME_MENU", Widget.RootWidget, new WidgetArgs()
-				{
-					{ "onExit", () => ingameRoot.IsVisible = () => true }
-				});
-			};
 
 			// Observer
 			if (world.LocalPlayer == null)
-			{
+				InitObserverWidgets(world, playerRoot);
-				var observerWidgets = Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs());
-				observerWidgets.GetWidget<ButtonWidget>("OPTIONS_BUTTON").OnClick = onOptionsClick;
-			}
 			else
+				InitPlayerWidgets(world, playerRoot);
+		}
+
+		public void OptionsClicked()
+		{
+			if (menu != MenuType.None)
 			{
-				// Real player
+				Widget.CloseWindow();
-				var playerWidgets = Game.LoadWidget(world, "PLAYER_WIDGETS", playerRoot, new WidgetArgs());
+				menu = MenuType.None;
-				playerWidgets.IsVisible = () => true;
-
-				var sidebarRoot = playerWidgets.GetWidget("SIDEBAR_BACKGROUND");
-
-				var sellButton = sidebarRoot.GetWidget<ToggleButtonWidget>("SELL_BUTTON");
-				sellButton.OnClick = () => world.ToggleInputMode<SellOrderGenerator>();
-				sellButton.IsToggled = () => world.OrderGenerator is SellOrderGenerator;
-				var sellIcon = sellButton.GetWidget<ImageWidget>("ICON");
-				sellIcon.GetImageName = () => world.OrderGenerator is SellOrderGenerator ? "sell-active" : "sell";
-
-				var repairButton = sidebarRoot.GetWidget<ToggleButtonWidget>("REPAIR_BUTTON");
-				repairButton.IsDisabled = () => !RepairOrderGenerator.PlayerIsAllowedToRepair( world );
-				repairButton.OnClick = () => world.ToggleInputMode<RepairOrderGenerator>();
-				repairButton.IsToggled = () => world.OrderGenerator is RepairOrderGenerator;
-				var repairIcon = repairButton.GetWidget<ImageWidget>("ICON");
-				repairIcon.GetImageName = () => repairButton.IsDisabled() ? "repair-disabled" :
-					world.OrderGenerator is RepairOrderGenerator ? "repair-active" : "repair";
-
-				var playerResources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
-				sidebarRoot.GetWidget<LabelWidget>("CASH_DISPLAY").GetText = () =>
-					"${0}".F(playerResources.DisplayCash + playerResources.DisplayOre);
-
-				queueTabs = playerWidgets.GetWidget<ProductionTabsWidget>("PRODUCTION_TABS");
-				world.ActorAdded += queueTabs.ActorChanged;
-				world.ActorRemoved += queueTabs.ActorChanged;
-
-				var queueTypes = sidebarRoot.GetWidget("PRODUCTION_TYPES");
-				SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("BUILDING"), "Building");
-				SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("DEFENSE"), "Defense");
-				SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("INFANTRY"), "Infantry");
-				SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("VEHICLE"), "Vehicle");
-				SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("AIRCRAFT"), "Aircraft");
-
-				playerWidgets.GetWidget<ButtonWidget>("OPTIONS_BUTTON").OnClick = onOptionsClick;
-
-				var cheatsButton = playerWidgets.GetWidget<ButtonWidget>("CHEATS_BUTTON");
-				cheatsButton.OnClick = () =>
-				{
-					if (menu != MenuType.None)
-						Widget.CloseWindow();
-
-					menu = MenuType.Cheats;
-					Game.OpenWindow("CHEATS_PANEL", new WidgetArgs() {{"onExit", () => menu = MenuType.None }});
-				};
-				cheatsButton.IsVisible = () => world.LocalPlayer != null && world.LobbyInfo.GlobalSettings.AllowCheats;
-
-				var postgameBG = ingameRoot.GetWidget("POSTGAME_BG");
-				postgameBG.IsVisible = () =>
-				{
-					return world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Undefined;
-				};
-
-				postgameBG.GetWidget<LabelWidget>("TEXT").GetText = () =>
-				{
-					var state = world.LocalPlayer.WinState;
-					return (state == WinState.Undefined)? "" :
-									((state == WinState.Lost)? "YOU ARE DEFEATED" : "YOU ARE VICTORIOUS");
-				};
 			}
+
+			ingameRoot.IsVisible = () => false;
+			Game.LoadWidget(world, "INGAME_MENU", Widget.RootWidget, new WidgetArgs()
+			{
+				{ "onExit", () => ingameRoot.IsVisible = () => true }
+			});
+		}
+
+		public void InitObserverWidgets(World world, Widget playerRoot)
+		{
+			var observerWidgets = Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs());
+			observerWidgets.GetWidget<ButtonWidget>("OPTIONS_BUTTON").OnClick = OptionsClicked;
+		}
+
+		public void InitPlayerWidgets(World world, Widget playerRoot)
+		{
+			// Real player
+			var playerWidgets = Game.LoadWidget(world, "PLAYER_WIDGETS", playerRoot, new WidgetArgs());
+			playerWidgets.IsVisible = () => true;
+
+			var sidebarRoot = playerWidgets.GetWidget("SIDEBAR_BACKGROUND");
+
+			var sellButton = sidebarRoot.GetWidget<ToggleButtonWidget>("SELL_BUTTON");
+			sellButton.OnClick = () => world.ToggleInputMode<SellOrderGenerator>();
+			sellButton.IsToggled = () => world.OrderGenerator is SellOrderGenerator;
+			var sellIcon = sellButton.GetWidget<ImageWidget>("ICON");
+			sellIcon.GetImageName = () => world.OrderGenerator is SellOrderGenerator ? "sell-active" : "sell";
+
+			var repairButton = sidebarRoot.GetWidget<ToggleButtonWidget>("REPAIR_BUTTON");
+			repairButton.IsDisabled = () => !RepairOrderGenerator.PlayerIsAllowedToRepair( world );
+			repairButton.OnClick = () => world.ToggleInputMode<RepairOrderGenerator>();
+			repairButton.IsToggled = () => world.OrderGenerator is RepairOrderGenerator;
+			var repairIcon = repairButton.GetWidget<ImageWidget>("ICON");
+			repairIcon.GetImageName = () => repairButton.IsDisabled() ? "repair-disabled" :
+				world.OrderGenerator is RepairOrderGenerator ? "repair-active" : "repair";
+
+			var playerResources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
+			sidebarRoot.GetWidget<LabelWidget>("CASH_DISPLAY").GetText = () =>
+				"${0}".F(playerResources.DisplayCash + playerResources.DisplayOre);
+
+			queueTabs = playerWidgets.GetWidget<ProductionTabsWidget>("PRODUCTION_TABS");
+			world.ActorAdded += queueTabs.ActorChanged;
+			world.ActorRemoved += queueTabs.ActorChanged;
+
+			var queueTypes = sidebarRoot.GetWidget("PRODUCTION_TYPES");
+			SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("BUILDING"), "Building");
+			SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("DEFENSE"), "Defense");
+			SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("INFANTRY"), "Infantry");
+			SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("VEHICLE"), "Vehicle");
+			SetupProductionGroupButton(queueTypes.GetWidget<ToggleButtonWidget>("AIRCRAFT"), "Aircraft");
+
+			playerWidgets.GetWidget<ButtonWidget>("OPTIONS_BUTTON").OnClick = OptionsClicked;
+
+			var cheatsButton = playerWidgets.GetWidget<ButtonWidget>("CHEATS_BUTTON");
+			cheatsButton.OnClick = () =>
+			{
+				if (menu != MenuType.None)
+					Widget.CloseWindow();
+
+				menu = MenuType.Cheats;
+				Game.OpenWindow("CHEATS_PANEL", new WidgetArgs() {{"onExit", () => menu = MenuType.None }});
+			};
+			cheatsButton.IsVisible = () => world.LocalPlayer != null && world.LobbyInfo.GlobalSettings.AllowCheats;
+
+			var winLossWatcher = playerWidgets.GetWidget<LogicTickerWidget>("WIN_LOSS_WATCHER");
+			winLossWatcher.OnTick = () =>
+			{
+				if (world.LocalPlayer.WinState != WinState.Undefined)
+					Game.RunAfterTick(() =>
+					{
+						playerRoot.RemoveChildren();
+						InitObserverWidgets(world, playerRoot);
+					});
+			};
 		}
 	}
 }

OpenRA.Mods.Cnc/Widgets/LogicTickerWidget.cs

@@ -0,0 +1,21 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.Cnc.Widgets
+{
+	public class LogicTickerWidget : Widget
+	{
+		public Action OnTick = () => {};
+		public override void Tick() { OnTick(); }
+	}
+}

OpenRA.Mods.RA/Widgets/RadarWidget.cs

@@ -149,9 +149,8 @@ namespace OpenRA.Mods.RA.Widgets
 		int updateTicks = 0;
 		public override void Tick()
 		{
-			var hasRadarNew = world.LocalPlayer == null || world
+			var hasRadarNew = world.LocalPlayer == null || world.LocalPlayer.WinState != WinState.Undefined ||
-				.ActorsWithTrait<ProvidesRadar>()
+				world.ActorsWithTrait<ProvidesRadar>().Any(a => a.Actor.Owner == world.LocalPlayer && a.Trait.IsActive);
-				.Any(a => a.Actor.Owner == world.LocalPlayer && a.Trait.IsActive);
 			
 			if (hasRadarNew != hasRadar)
 			{

mods/cnc/chrome/ingame.yaml

@@ -88,6 +88,8 @@ Container@OBSERVER_WIDGETS:
 Container@PLAYER_WIDGETS:
 	Id:PLAYER_WIDGETS
 	Children:
+		LogicTicker:
+			Id:WIN_LOSS_WATCHER
 		Button@CHEATS_BUTTON:
 			Id:CHEATS_BUTTON
 			X:WINDOW_RIGHT-400
@@ -98,23 +100,6 @@ Container@PLAYER_WIDGETS:
 		WorldCommand:
 			Width:WINDOW_RIGHT
 			Height:WINDOW_BOTTOM
-		Background@POSTGAME_BG:
-			Id:POSTGAME_BG
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:400
-			Height:100
-			Background:panel-black
-			Visible:false
-			Children:
-				Label@TEXT:
-					Id:TEXT
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:(PARENT_BOTTOM - HEIGHT)/2
-					Width:200
-					Height:40
-					Align:Center
-					Font:Bold
 		SupportPowers:
 			TooltipContainer:TOOLTIP_CONTAINER
 			X:10