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

Merge Rearm and Repair into Resupply activity

Browse Source 
Allows parallel rearming and repairing.
This commit is contained in:
reaperrr
2019-03-24 16:26:14 +01:00
committed by Paul Chote
parent 123b3f054f
commit ba4b5738d7
9 changed files with 109 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -541,16 +541,6 @@ namespace OpenRA.Mods.Common.Traits
return Info.LandableTerrainTypes.Contains(type);
}
public bool CanRearmAt(Actor host)
{
return rearmable != null && rearmable.Info.RearmActors.Contains(host.Info.Name) && rearmable.RearmableAmmoPools.Any(p => !p.FullAmmo());
}
public bool CanRepairAt(Actor host)
{
return repairable != null && repairable.Info.RepairActors.Contains(host.Info.Name) && self.GetDamageState() != DamageState.Undamaged;
}
bool IsBlockedBy(Actor self, Actor otherActor, Actor ignoreActor)
{
// We are not blocked by the actor we are ignoring.
@@ -580,14 +570,14 @@ namespace OpenRA.Mods.Common.Traits
return true;
}
public virtual IEnumerable<Activity> GetResupplyActivities(Actor a)
public bool CanRearmAt(Actor host)
{
// The ResupplyAircraft activity guarantees that we're on the helipad/repair depot
if (CanRearmAt(a))
yield return new Rearm(self, a, WDist.Zero);
return rearmable != null && rearmable.Info.RearmActors.Contains(host.Info.Name) && rearmable.RearmableAmmoPools.Any(p => !p.FullAmmo());
}
if (CanRepairAt(a))
yield return new Repair(self, a, WDist.Zero);
public bool CanRepairAt(Actor host)
{
return repairable != null && repairable.Info.RepairActors.Contains(host.Info.Name) && self.GetDamageState() != DamageState.Undamaged;
}
public void ModifyDeathActorInit(Actor self, TypeDictionary init)