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

Merge pull request #5259 from JordanGlue/bleed

Browse Source 
Fixing Helis taking off after rearmed but before repaired
This commit is contained in:
Matthias Mailänder
2014-05-05 13:47:28 +02:00
parent b1045dfce6 84030fd3c0
commit bf9d3a8082
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Activities/Rearm.cs
View File

@@ -42,8 +42,17 @@ namespace OpenRA.Mods.RA.Activities
{ {
var helicopter = self.TraitOrDefault<Helicopter>(); var helicopter = self.TraitOrDefault<Helicopter>();
if (helicopter != null) if (helicopter != null)
{
if (helicopter.Info.RepairBuildings.Contains(hostBuilding.Info.Name) && self.HasTrait<Health>())
{
if (self.Trait<Health>().DamageState != DamageState.Undamaged)
return NextActivity;
}
return helicopter.TakeOff(hostBuilding); return helicopter.TakeOff(hostBuilding);
else return NextActivity; }
return NextActivity;
} }
if (hostBuilding != null) if (hostBuilding != null)

9
OpenRA.Mods.RA/Activities/Repair.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System; using System;
using System.Linq;
using OpenRA.Mods.RA.Air; using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Render; using OpenRA.Mods.RA.Render;
using OpenRA.Traits; using OpenRA.Traits;
@@ -34,7 +35,15 @@ namespace OpenRA.Mods.RA.Activities
{ {
var helicopter = self.TraitOrDefault<Helicopter>(); var helicopter = self.TraitOrDefault<Helicopter>();
if (helicopter != null) if (helicopter != null)
{
if (helicopter.Info.RearmBuildings.Contains(host.Info.Name) && self.HasTrait<LimitedAmmo>())
{
if (self.Trait<LimitedAmmo>().FullAmmo() == false)
return NextActivity;
}
return helicopter.TakeOff(host); return helicopter.TakeOff(host);
}
return NextActivity; return NextActivity;
} }