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

Fix e6

Browse Source
This commit is contained in:
Paul Chote
2010-06-16 21:06:09 +12:00
parent 1088e30158
commit a0e4e40eaf
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Activities/CaptureBuilding.cs
View File

@@ -33,16 +33,16 @@ namespace OpenRA.Mods.RA.Activities
public IActivity Tick(Actor self)
{
if (target == null || target.IsDead) return NextActivity;
var damage = -self.Info.Traits.Get<EngineerCaptureInfo>().EngineerDamage;
if (self.Owner.Stances[ target.Owner ] == Stance.Ally)
{
if (target.Health == target.Info.Traits.Get<OwnedActorInfo>().HP)
return NextActivity;
target.InflictDamage(self, -EngineerCapture.EngineerDamage, null);
target.InflictDamage(self, damage, null);
}
else
{
if (target.Health - EngineerCapture.EngineerDamage <= 0)
if (target.Health - damage <= 0)
{
target.World.AddFrameEndTask(w =>
{ // momentarily remove from world so the ownership queries don't get confused
@@ -54,10 +54,10 @@ namespace OpenRA.Mods.RA.Activities
t.OnCapture(target, self);
});
target.InflictDamage(self, target.Health - EngineerCapture.EngineerDamage, null);
target.InflictDamage(self, target.Health - damage, null);
}
else
target.InflictDamage(self, EngineerCapture.EngineerDamage, null);
target.InflictDamage(self, damage, null);
}
// the engineer is sacrificed.