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

6
OpenRA.Mods.Common/Widgets/ProductionTabsWidget.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Widgets
public List<ProductionTab> Tabs = new List<ProductionTab>();
public string Group;
public int NextQueueName = 1;
public bool Alert { get { return Tabs.Any(t => t.Queue.CurrentDone); } }
public bool Alert { get { return Tabs.Any(t => t.Queue.AllQueued().Any(i => i.Done)); } }
public void Update(IEnumerable<ProductionQueue> allQueues)
{
@@ -111,7 +111,7 @@ namespace OpenRA.Mods.Common.Widgets
// Prioritize alerted queues
var queues = Groups[queueGroup].Tabs.Select(t => t.Queue)
.OrderByDescending(q => q.CurrentDone ? 1 : 0)
.OrderByDescending(q => q.AllQueued().Any(i => i.Done) ? 1 : 0)
.ToList();
if (reverse) queues.Reverse();
@@ -195,7 +195,7 @@ namespace OpenRA.Mods.Common.Widgets
var textSize = font.Measure(tab.Name);
var position = new int2(rect.X + (rect.Width - textSize.X) / 2, rect.Y + (rect.Height - textSize.Y) / 2);
font.DrawTextWithContrast(tab.Name, position, tab.Queue.CurrentDone ? Color.Gold : Color.White, Color.Black, 1);
font.DrawTextWithContrast(tab.Name, position, tab.Queue.AllQueued().Any(i => i.Done) ? Color.Gold : Color.White, Color.Black, 1);
}
Game.Renderer.DisableScissor();