Production now uses nearest exit to rally point.

This commit is contained in:
abcdefg30
2020-10-24 11:36:59 +02:00
committed by Paul Chote
parent 38f1f1e5c2
commit f5a963ac47
4 changed files with 11 additions and 11 deletions

View File

@@ -46,16 +46,13 @@ namespace OpenRA.Mods.Common.Traits
public static class ExitExts
{
public static Exit FirstExitOrDefault(this Actor actor, string productionType = null)
public static Exit NearestExitOrDefault(this Actor actor, WPos pos, string productionType = null, Func<Exit, bool> p = null)
{
var all = actor.TraitsImplementing<Exit>()
.Where(Exts.IsTraitEnabled)
.OrderBy(e => e.Info.Priority);
var all = Exits(actor, productionType)
.OrderBy(e => e.Info.Priority)
.ThenBy(e => (actor.CenterPosition + e.Info.SpawnOffset - pos).Length);
if (string.IsNullOrEmpty(productionType))
return all.FirstOrDefault();
return all.FirstOrDefault(e => e.Info.ProductionTypes.Count == 0 || e.Info.ProductionTypes.Contains(productionType));
return p != null ? all.FirstOrDefault(p) : all.FirstOrDefault();
}
public static IEnumerable<Exit> Exits(this Actor actor, string productionType = null)