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

take low power slowdown into account

Browse Source 
fixes #4840
This commit is contained in:
Matthias Mailänder
2014-04-18 18:29:10 +02:00
parent 326d28a084
commit b6f2c119a7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -280,6 +280,7 @@ NEW:
Fixed helicopters falling down not revealing shroud. Fixed helicopters falling down not revealing shroud.
Fixed effect (explosions, etc) saturation when the ingame menu is activated. Fixed effect (explosions, etc) saturation when the ingame menu is activated.
Added shadow to crate artwork. Added shadow to crate artwork.
Fixed build palette tooltip not taking low power slowdown into account when displaying the build time.
Dune 2000: Dune 2000:
Added buildable concrete walls. Added buildable concrete walls.
Fixed some cliffs being passable. Fixed some cliffs being passable.

8
OpenRA.Mods.Cnc/Widgets/Logic/ProductionTooltipLogic.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -64,8 +64,12 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
? Color.White : Color.Red; ? Color.White : Color.Red;
powerLabel.IsVisible = () => power != 0; powerLabel.IsVisible = () => power != 0;
var timeString = "T: {0}".F(WidgetUtils.FormatTime(palette.CurrentQueue.GetBuildTime(actor))); var lowpower = pm.PowerState != PowerState.Normal;
var time = palette.CurrentQueue.GetBuildTime(actor)
* ((lowpower) ? palette.CurrentQueue.Info.LowPowerSlowdown : 1);
var timeString = "T: {0}".F(WidgetUtils.FormatTime(time));
timeLabel.GetText = () => timeString; timeLabel.GetText = () => timeString;
timeLabel.GetColor = () => lowpower ? Color.Red : Color.White;
var costString = "$: {0}".F(cost); var costString = "$: {0}".F(cost);
costLabel.GetText = () => costString; costLabel.GetText = () => costString;