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

Fix #1236 - Aircraft with full health landing on FIX costs the player money

Browse Source 
Note: still allows a plane on full health to land on FIX.
This commit is contained in:
alzeih
2011-12-11 22:35:08 +13:00
committed by Chris Forbes
parent 1b0724719d
commit aa9dd73fe5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ namespace OpenRA.Mods.RA.Activities
{ {
int remainingTicks; int remainingTicks;
Actor host; Actor host;
Health health;
public Repair(Actor host) { this.host = host; } public Repair(Actor host) { this.host = host; }
@@ -25,11 +26,14 @@ namespace OpenRA.Mods.RA.Activities
{ {
if (IsCanceled) return NextActivity; if (IsCanceled) return NextActivity;
if (host != null && !host.IsInWorld) return NextActivity; if (host != null && !host.IsInWorld) return NextActivity;
health = self.TraitOrDefault<Health>();
if (health == null) return NextActivity;
if (health.DamageState == DamageState.Undamaged)
return NextActivity;
if (remainingTicks == 0) if (remainingTicks == 0)
{ {
var health = self.TraitOrDefault<Health>();
if (health == null) return NextActivity;
var repairsUnits = host.Info.Traits.Get<RepairsUnitsInfo>(); var repairsUnits = host.Info.Traits.Get<RepairsUnitsInfo>();
var unitCost = self.Info.Traits.Get<ValuedInfo>().Cost; var unitCost = self.Info.Traits.Get<ValuedInfo>().Cost;
var hpToRepair = repairsUnits.HpPerStep; var hpToRepair = repairsUnits.HpPerStep;
@@ -40,10 +44,7 @@ namespace OpenRA.Mods.RA.Activities
remainingTicks = 1; remainingTicks = 1;
return this; return this;
} }
self.InflictDamage(self, -hpToRepair, null); self.InflictDamage(self, -hpToRepair, null);
if (health.DamageState == DamageState.Undamaged)
return NextActivity;
if (host != null) if (host != null)
host.Trait<RenderBuilding>() host.Trait<RenderBuilding>()