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

Add ReloadAmmoPool and adapt AmmoPool

Browse Source 
Refactored and simplified Rearm activity.
Uses local Reload now.

Removed AmmoPool.SelfReloads.
This commit is contained in:
reaperrr
2017-06-23 14:47:26 +02:00
committed by Paul Chote
parent a017018bee
commit 6f95080aa4
12 changed files with 152 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/AI/HackyAI.cs
View File

@@ -500,9 +500,9 @@ namespace OpenRA.Mods.Common.AI
if (aircraftInfo == null)
return true;
var ammoPoolsInfo = actorInfo.TraitInfos<AmmoPoolInfo>();
if (ammoPoolsInfo.Any(x => !x.SelfReloads))
// If the aircraft has at least 1 AmmoPool and defines 1 or more RearmBuildings, check if we have enough of those
var hasAmmoPool = actorInfo.TraitInfos<AmmoPoolInfo>().Any();
if (hasAmmoPool && aircraftInfo.RearmBuildings.Count > 0)
{
var countOwnAir = CountUnits(actorInfo.Name, Player);
var countBuildings = aircraftInfo.RearmBuildings.Sum(b => CountBuilding(b, Player));

2
OpenRA.Mods.Common/AI/States/AirStates.cs
View File

@@ -120,7 +120,7 @@ namespace OpenRA.Mods.Common.AI
protected static bool ReloadsAutomatically(Actor a)
{
var ammoPools = a.TraitsImplementing<AmmoPool>();
return ammoPools.All(x => x.Info.SelfReloads);
return ammoPools.All(x => x.SelfReloads);
}
protected static bool IsRearm(Actor a)