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

Remove RepairBuildings from Aircraft

Browse Source 
Require them to use Repairable trait instead.
This commit is contained in:
reaperrr
2017-11-13 23:25:23 +01:00
committed by Paul Chote
parent ed7d12506d
commit 139d5efba8
9 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -22,6 +22,7 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Aircraft aircraft;
readonly AircraftInfo aircraftInfo;
readonly RepairableInfo repairableInfo;
readonly bool alwaysLand;
readonly bool abortOnResupply;
bool isCalculated;
@@ -35,6 +36,7 @@ namespace OpenRA.Mods.Common.Activities
this.abortOnResupply = abortOnResupply;
aircraft = self.Trait<Aircraft>();
aircraftInfo = self.Info.TraitInfo<AircraftInfo>();
repairableInfo = self.Info.TraitInfoOrDefault<RepairableInfo>();
}
public static Actor ChooseResupplier(Actor self, bool unreservedOnly)
@@ -104,7 +106,7 @@ namespace OpenRA.Mods.Common.Activities
if (alwaysLand)
return true;
if (aircraftInfo.RepairBuildings.Contains(dest.Info.Name) && self.GetDamageState() != DamageState.Undamaged)
if (repairableInfo != null && repairableInfo.RepairBuildings.Contains(dest.Info.Name) && self.GetDamageState() != DamageState.Undamaged)
return true;
return aircraftInfo.RearmBuildings.Contains(dest.Info.Name) && self.TraitsImplementing<AmmoPool>()