diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 73311e8565..567dc468a0 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -263,6 +263,7 @@
+
diff --git a/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs b/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs
index 111b70b9fb..783f2c1fe3 100644
--- a/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs
+++ b/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs
@@ -31,12 +31,12 @@ namespace OpenRA.Mods.RA
public class StrategicVictoryConditions : ITick
{
[Sync] public Actor Self;
- [Sync] public StrategicVictoryConditionsInfo Info;
+ public StrategicVictoryConditionsInfo Info;
[Sync] public int TicksToHold;
[Sync] public bool ResetOnHoldLost;
- [Sync] public float RatioRequired;
- [Sync] public float CriticalRatioRequired;
+ public float RatioRequired;
+ public float CriticalRatioRequired;
[Sync] public bool SplitHolds;
[Sync] public int TicksLeft = 0;
[Sync] public int CriticalTicksLeft = 0;
diff --git a/OpenRA.Mods.RA/Widgets/StrategicProgressWidget.cs b/OpenRA.Mods.RA/Widgets/StrategicProgressWidget.cs
new file mode 100644
index 0000000000..6255d19c57
--- /dev/null
+++ b/OpenRA.Mods.RA/Widgets/StrategicProgressWidget.cs
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.RA.Widgets
+{
+ public class StrategicProgressWidget : Widget
+ {
+ bool Initialised = false;
+
+ public StrategicProgressWidget() { IsVisible = () => true; }
+
+ public override void DrawInner(WorldRenderer wr)
+ {
+ if (!Initialised)
+ Init(wr);
+
+ if (!IsVisible()) return;
+ int2 offset = int2.Zero;
+
+ var svc = wr.world.players.Select(p => p.Value.PlayerActor.TraitOrDefault()).FirstOrDefault();
+
+ var totalWidth = (svc.Total + svc.TotalCritical)*32;
+ int curX = -(totalWidth / 2);
+
+ foreach (var a in wr.world.Actors.Where(a => !a.Destroyed && a.HasTrait() && !a.TraitOrDefault().Critical))
+ {
+ WidgetUtils.DrawRGBA(ChromeProvider.GetImage("strategic", "unowned"), offset + new float2(RenderBounds.Left + curX, RenderBounds.Top));
+
+ if (a.Owner == wr.world.LocalPlayer || (a.Owner.Stances[wr.world.LocalPlayer] == Stance.Ally && wr.world.LocalPlayer.Stances[a.Owner] == Stance.Ally))
+ WidgetUtils.DrawRGBA(ChromeProvider.GetImage("strategic", "player_owned"), offset + new float2(RenderBounds.Left + curX, RenderBounds.Top));
+ else if (!a.Owner.NonCombatant)
+ WidgetUtils.DrawRGBA(ChromeProvider.GetImage("strategic", "enemy_owned"), offset + new float2(RenderBounds.Left + curX, RenderBounds.Top));
+ curX += 32;
+ }
+
+ foreach (var a in wr.world.Actors.Where(a => !a.Destroyed && a.HasTrait() && a.TraitOrDefault().Critical))
+ {
+ WidgetUtils.DrawRGBA(ChromeProvider.GetImage("strategic", "critical_unowned"), offset + new float2(RenderBounds.Left + curX, RenderBounds.Top));
+
+ if (a.Owner == wr.world.LocalPlayer || (a.Owner.Stances[wr.world.LocalPlayer] == Stance.Ally && wr.world.LocalPlayer.Stances[a.Owner] == Stance.Ally))
+ WidgetUtils.DrawRGBA(ChromeProvider.GetImage("strategic", "player_owned"), offset + new float2(RenderBounds.Left + curX, RenderBounds.Top));
+ else if (!a.Owner.NonCombatant)
+ WidgetUtils.DrawRGBA(ChromeProvider.GetImage("strategic", "enemy_owned"), offset + new float2(RenderBounds.Left + curX, RenderBounds.Top));
+
+ curX += 32;
+ }
+ offset += new int2(0, 32);
+
+ var pendingWinner = FindFirstWinningPlayer(wr.world);
+ if (pendingWinner == null) return;
+ svc = pendingWinner.PlayerActor.TraitOrDefault();
+
+ if (wr.world.LocalPlayer == null)
+ {
+ }else
+ {
+ var tc = "";
+
+ if (pendingWinner != wr.world.LocalPlayer && (pendingWinner.Stances[wr.world.LocalPlayer] != Stance.Ally || wr.world.LocalPlayer.Stances[pendingWinner] != Stance.Ally))
+ {
+ // losing
+ tc = "Strategic defeat in " + ((svc.CriticalTicksLeft > svc.TicksLeft) ? svc.CriticalTicksLeft / 25 : svc.TicksLeft / 25) + " second(s)";
+ }else
+ {
+ // winning
+ tc = "Strategic victory in " + ((svc.CriticalTicksLeft > svc.TicksLeft) ? svc.CriticalTicksLeft / 25 : svc.TicksLeft / 25) + " second(s)";
+ }
+
+ var size = Game.Renderer.BoldFont.Measure(tc);
+
+ Game.Renderer.BoldFont.DrawText(tc, offset + new float2(RenderBounds.Left - size.X / 2 + 1, RenderBounds.Top + 1), Color.Black);
+ Game.Renderer.BoldFont.DrawText(tc, offset + new float2(RenderBounds.Left - size.X / 2, RenderBounds.Top), Color.WhiteSmoke);
+ offset += new int2(0, size.Y + 1);
+ }
+
+ }
+
+ public Player FindFirstWinningPlayer(World world)
+ {
+ // loop through all players, see who is 'winning' and get the one with the shortest 'time to win'
+ int shortest = int.MaxValue;
+ Player shortestPlayer = null;
+
+ foreach (var p in world.players.Select(p => p.Value).Where(p => !p.NonCombatant))
+ {
+ var svc = p.PlayerActor.TraitOrDefault();
+
+ if (svc.HoldingCritical && svc.CriticalTicksLeft > 0 && svc.CriticalTicksLeft < shortest)
+ {
+ shortest = svc.CriticalTicksLeft;
+ shortestPlayer = p;
+ }
+
+ if (svc.Holding && svc.TicksLeft > 0 && svc.TicksLeft < shortest)
+ {
+ shortest = svc.CriticalTicksLeft;
+ shortestPlayer = p;
+ }
+ }
+
+ return shortestPlayer;
+ }
+
+ private void Init(WorldRenderer wr)
+ {
+ IsVisible = () => (wr.world.Actors.Where(a => a.HasTrait()).Any() && wr.world.Actors.Where(a => a.HasTrait()).Any());
+ Initialised = true;
+ }
+ }
+}
diff --git a/mods/cnc/chrome.xml b/mods/cnc/chrome.xml
index c1c45660c0..66086c8446 100644
--- a/mods/cnc/chrome.xml
+++ b/mods/cnc/chrome.xml
@@ -209,4 +209,12 @@
+
+
+
+
+
+
+
+
diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index ca056a4278..5d10e5ab08 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -21,6 +21,10 @@ Container@INGAME_ROOT:
Id:GAME_TIMER
X: WINDOW_RIGHT/2
Y: 10
+ StrategicProgress@STRATEGIC_PROGRESS:
+ Id:STRATEGIC_PROGRESS
+ X: WINDOW_RIGHT/2
+ Y: 40
Background@POSTGAME_BG:
Id:POSTGAME_BG
X:(WINDOW_RIGHT - WIDTH)/2
diff --git a/mods/cnc/uibits/strategic.png b/mods/cnc/uibits/strategic.png
new file mode 100644
index 0000000000..aec7756e76
Binary files /dev/null and b/mods/cnc/uibits/strategic.png differ
diff --git a/mods/ra/chrome.xml b/mods/ra/chrome.xml
index de56a921f1..98aac6e173 100644
--- a/mods/ra/chrome.xml
+++ b/mods/ra/chrome.xml
@@ -174,6 +174,14 @@
+
+
+
+
+
+
+
+
diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml
index cbec32b27b..7062c727d2 100644
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -22,6 +22,10 @@ Container@INGAME_ROOT:
Id:GAME_TIMER
X: WINDOW_RIGHT/2
Y: 10
+ StrategicProgress@STRATEGIC_PROGRESS:
+ Id:STRATEGIC_PROGRESS
+ X: WINDOW_RIGHT/2
+ Y: 40
Background@POSTGAME_BG:
Id:POSTGAME_BG
X:(WINDOW_RIGHT - WIDTH)/2
diff --git a/mods/ra/uibits/strategic.png b/mods/ra/uibits/strategic.png
new file mode 100644
index 0000000000..aec7756e76
Binary files /dev/null and b/mods/ra/uibits/strategic.png differ