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

Refactored ProductionQueue to support different production styles.

Browse Source
This commit is contained in:
Andre Mohren
2018-09-28 22:54:18 +02:00
committed by abcdefg30
parent 6cd1919cca
commit 3bfcecd539
13 changed files with 98 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Render/ProductionBar.cs
View File

@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits.Render
void ITick.Tick(Actor self)
{
var current = queue.CurrentItem();
var current = queue.AllQueued().Where(i => i.Started).OrderBy(i => i.RemainingTime).FirstOrDefault();
value = current != null ? 1 - (float)current.RemainingCost / current.TotalCost : 0;
}

2
OpenRA.Mods.Common/Traits/Render/WithProductionOverlay.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits.Render
bool IsProducing
{
get { return queues != null && queues.Any(q => q.Enabled && q.CurrentItem() != null && !q.CurrentPaused); }
get { return queues != null && queues.Any(q => q.Enabled && q.AllQueued().Any(i => !i.Paused && i.Started)); }
}
public WithProductionOverlay(Actor self, WithProductionOverlayInfo info)