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

Fix CursorForOrderString to work with orders + preliminary e6 fixes

Browse Source
This commit is contained in:
Paul Chote
2010-07-23 17:11:52 +12:00
parent 5019bb8b6e
commit 71420df0f3
25 changed files with 179 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,32 +23,25 @@ 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)
var damage = self.Info.Traits.Get<EngineerCaptureInfo>().EngineerDamage;
if (target.Health - damage <= 0)
{
if (target.Health == target.Info.Traits.Get<OwnedActorInfo>().HP)
return NextActivity;
target.InflictDamage(self, damage, null);
target.World.AddFrameEndTask(w =>
{
// momentarily remove from world so the ownership queries don't get confused
w.Remove(target);
target.Owner = self.Owner;
w.Add(target);
foreach (var t in target.traits.WithInterface<INotifyCapture>())
t.OnCapture(target, self);
});
target.InflictDamage(self, target.Health - damage, null);
}
else
{
if (target.Health - damage <= 0)
{
target.World.AddFrameEndTask(w =>
{ // momentarily remove from world so the ownership queries don't get confused
w.Remove(target);
target.Owner = self.Owner;
w.Add(target);
foreach (var t in target.traits.WithInterface<INotifyCapture>())
t.OnCapture(target, self);
});
target.InflictDamage(self, target.Health - damage, null);
}
else
target.InflictDamage(self, damage, null);
}
target.InflictDamage(self, damage, null);
// the engineer is sacrificed.
self.World.AddFrameEndTask(w => w.Remove(self));