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

Shift Actor.Health onto a trait.

Browse Source 
Known regressions:
 - cnc only
 - health bar colors
 - can't repair buildings
This commit is contained in:
Paul Chote
2010-07-30 00:01:59 +12:00
parent 1e08dc6301
commit 6fba888d45
56 changed files with 530 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Activities/RepairBuilding.cs
View File

@@ -22,11 +22,12 @@ namespace OpenRA.Mods.RA.Activities
public IActivity Tick(Actor self)
{
if (target == null || target.IsDead) return NextActivity;
if (target.Health == target.GetMaxHP())
if (target == null || target.IsDead()) return NextActivity;
var health = target.traits.Get<Health>();
if (health.HP == health.MaxHP)
return NextActivity;
target.InflictDamage(self, -target.GetMaxHP(), null);
target.InflictDamage(self, -health.MaxHP, null);
self.World.AddFrameEndTask(w => w.Remove(self));
return NextActivity;