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

Fix inconsistent ordering

Browse Source
This commit is contained in:
Gustas
2023-09-05 18:06:39 +03:00
committed by Matthias Mailänder
parent 5b0f69b411
commit 161f4cbdff
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/CaptureManager.cs
View File

@@ -164,7 +164,7 @@ namespace OpenRA.Mods.Common.Traits
if (captee.IsDead) if (captee.IsDead)
return null; return null;
foreach (var c in enabledCaptures.OrderBy(c => c.Info.SabotageThreshold)) foreach (var c in enabledCaptures.OrderBy(c => c.Info.SabotageThreshold).ThenBy(c => c.Info.CaptureDelay))
if (capteeManager.CanBeTargetedBy(captee, self, c)) if (capteeManager.CanBeTargetedBy(captee, self, c))
return c; return c;
@@ -209,10 +209,7 @@ namespace OpenRA.Mods.Common.Traits
if (targetManager.beingCapturedToken == Actor.InvalidConditionToken) if (targetManager.beingCapturedToken == Actor.InvalidConditionToken)
targetManager.beingCapturedToken = target.GrantCondition(targetManager.info.BeingCapturedCondition); targetManager.beingCapturedToken = target.GrantCondition(targetManager.info.BeingCapturedCondition);
captures = enabledCaptures captures = ValidCapturesWithLowestSabotageThreshold(self, target, targetManager);
.OrderBy(c => c.Info.CaptureDelay)
.FirstOrDefault(c => targetManager.CanBeTargetedBy(target, self, c));
if (captures == null) if (captures == null)
return false; return false;