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

8
OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
View File

@@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Scripting
return false;
var queue = queues.Where(q => actorTypes.All(t => GetBuildableInfo(t).Queue.Contains(q.Info.Type)))
.FirstOrDefault(q => q.CurrentItem() == null);
.FirstOrDefault(q => !q.AllQueued().Any());
if (queue == null)
return false;
@@ -163,7 +163,7 @@ namespace OpenRA.Mods.Common.Scripting
return true;
return queues.Where(q => GetBuildableInfo(actorType).Queue.Contains(q.Info.Type))
.Any(q => q.CurrentItem() != null);
.Any(q => q.AllQueued().Any());
}
BuildableInfo GetBuildableInfo(string actorType)
@@ -225,7 +225,7 @@ namespace OpenRA.Mods.Common.Scripting
if (queueTypes.Any(t => !queues.ContainsKey(t) || productionHandlers.ContainsKey(t)))
return false;
if (queueTypes.Any(t => queues[t].CurrentItem() != null))
if (queueTypes.Any(t => queues[t].AllQueued().Any()))
return false;
if (actionFunc != null)
@@ -270,7 +270,7 @@ namespace OpenRA.Mods.Common.Scripting
if (!queues.ContainsKey(queue))
return true;
return productionHandlers.ContainsKey(queue) || queues[queue].CurrentItem() != null;
return productionHandlers.ContainsKey(queue) || queues[queue].AllQueued().Any();
}
BuildableInfo GetBuildableInfo(string actorType)