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

StateBase: More accurate way to check rearming

Browse Source
This commit is contained in:
dnqbob
2023-09-10 18:50:41 +08:00
committed by Gustas
parent 5d2f2bdd1d
commit 38ed21edd2
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Traits/BotModules/Squads/States/StateBase.cs
View File

@@ -106,21 +106,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
protected static bool IsRearming(Actor a) protected static bool IsRearming(Actor a)
{ {
if (a.IsIdle) return !a.IsIdle && (a.CurrentActivity.ActivitiesImplementing<Resupply>().Any() || a.CurrentActivity.ActivitiesImplementing<ReturnToBase>().Any());
return false;
var activity = a.CurrentActivity;
if (activity.GetType() == typeof(Resupply))
return true;
var next = activity.NextActivity;
if (next == null)
return false;
if (next.GetType() == typeof(Resupply))
return true;
return false;
} }
protected static bool FullAmmo(IEnumerable<AmmoPool> ammoPools) protected static bool FullAmmo(IEnumerable<AmmoPool> ammoPools)