diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs index d509a41fe5..b0b26ae7d3 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs @@ -10,6 +10,7 @@ using OpenRA.Mods.RA.Power; using OpenRA.Widgets; +using System.Drawing; namespace OpenRA.Mods.RA.Widgets.Logic { @@ -20,7 +21,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic { var powerManager = world.LocalPlayer.PlayerActor.Trait(); var power = widget.Get("POWER"); + var powerIcon = widget.Get("POWER_ICON"); + powerIcon.GetImageName = () => powerManager.ExcessPower < 0 ? "power-critical" : "power-normal"; + power.GetColor = () => powerManager.ExcessPower < 0 ? Color.Red : Color.White; power.GetText = () => powerManager.PowerProvided == 1000000 ? "inf" : powerManager.ExcessPower.ToString(); power.GetTooltipText = () => "Power Usage: " + powerManager.PowerDrained.ToString() + (powerManager.PowerProvided != 1000000 ? "/" + powerManager.PowerProvided.ToString() : ""); } diff --git a/artsrc/ra/chrome.psd b/artsrc/ra/chrome.psd index 4354e059e6..e536c649e7 100644 Binary files a/artsrc/ra/chrome.psd and b/artsrc/ra/chrome.psd differ diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index 57e4ee388d..c2f1055bcc 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -50,6 +50,10 @@ sidebar-bits: chrome.png production-tooltip-cost: 448, 80, 16, 16 production-iconoverlay: 314,118,238,48 +power-icons: chrome.png + power-normal: 350,0,12,18 + power-critical: 363,0,12,18 + production-icons: chrome.png building: 384,0,16,16 building-disabled: 384,16,16,16 diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/ra/chrome/ingame-player.yaml index e75d3e083e..240b960f7c 100644 --- a/mods/ra/chrome/ingame-player.yaml +++ b/mods/ra/chrome/ingame-player.yaml @@ -164,6 +164,7 @@ Container@PLAYER_WIDGETS: Children: Label@GAME_TIMER: Logic: GameTimerLogic + X: 3 Y: 263 Width: PARENT_RIGHT Height: 22 @@ -190,6 +191,12 @@ Container@PLAYER_WIDGETS: Text: {0} TooltipContainer: TOOLTIP_CONTAINER TooltipTemplate: SIMPLE_TOOLTIP + Children: + Image@POWER_ICON: + X: PARENT_RIGHT + 4 + Y: 5 + ImageCollection: power-icons + ImageName: power-normal Container@SIDEBAR_PRODUCTION: Logic: ClassicProductionLogic X: WINDOW_RIGHT - 250 diff --git a/mods/ra/uibits/chrome.png b/mods/ra/uibits/chrome.png index bec994d961..24e1d2d511 100644 Binary files a/mods/ra/uibits/chrome.png and b/mods/ra/uibits/chrome.png differ