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

fix entering buildings from the east or south

Browse Source
This commit is contained in:
Bob
2010-10-22 10:20:34 +13:00
parent 88a8d84153
commit f933e3de3f
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,33 +8,36 @@
*/ */
#endregion #endregion
using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities
{ {
class CaptureBuilding : CancelableActivity class CaptureBuilding : CancelableActivity
{ {
Target target; Actor target;
public CaptureBuilding(Actor target) { this.target = Target.FromActor(target); } public CaptureBuilding(Actor target) { this.target = target; }
public override IActivity Tick(Actor self) public override IActivity Tick(Actor self)
{ {
if (IsCanceled) return NextActivity; if (IsCanceled) return NextActivity;
if (!target.IsValid) return NextActivity; if (target == null || !target.IsInWorld || target.IsDead()) return NextActivity;
if ((target.Actor.Location - self.Location).Length > 1) if (target.Owner == self.Owner) return NextActivity;
return NextActivity;
if( !target.Trait<IOccupySpace>().OccupiedCells().Any( x => x == self.Location ) )
return NextActivity;
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
// momentarily remove from world so the ownership queries don't get confused // momentarily remove from world so the ownership queries don't get confused
var oldOwner = target.Actor.Owner; var oldOwner = target.Owner;
w.Remove(target.Actor); w.Remove(target);
target.Actor.Owner = self.Owner; target.Owner = self.Owner;
w.Add(target.Actor); w.Add(target);
foreach (var t in target.Actor.TraitsImplementing<INotifyCapture>()) foreach (var t in target.TraitsImplementing<INotifyCapture>())
t.OnCapture(target.Actor, self, oldOwner, self.Owner); t.OnCapture(target, self, oldOwner, self.Owner);
self.Destroy(); self.Destroy();
}); });

6
OpenRA.Mods.RA/Activities/Infiltrate.cs
View File

@@ -8,6 +8,7 @@
*/ */
#endregion #endregion
using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities
@@ -23,12 +24,15 @@ namespace OpenRA.Mods.RA.Activities
if (target == null || !target.IsInWorld || target.IsDead()) return NextActivity; if (target == null || !target.IsInWorld || target.IsDead()) return NextActivity;
if (target.Owner == self.Owner) return NextActivity; if (target.Owner == self.Owner) return NextActivity;
if( !target.Trait<IOccupySpace>().OccupiedCells().Any( x => x == self.Location ) )
return NextActivity;
foreach (var t in target.TraitsImplementing<IAcceptSpy>()) foreach (var t in target.TraitsImplementing<IAcceptSpy>())
t.OnInfiltrate(target, self); t.OnInfiltrate(target, self);
self.Destroy(); self.Destroy();
return NextActivity; return this;
} }
} }
} }

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

@@ -6,33 +6,34 @@
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
* see LICENSE. * see LICENSE.
*/ */
#endregion #endregion
using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities
{ {
class RepairBuilding : CancelableActivity class RepairBuilding : CancelableActivity
{ {
Target target; Actor target;
public RepairBuilding(Actor target) { this.target = Target.FromActor(target); } public RepairBuilding(Actor target) { this.target = target; }
public override IActivity Tick(Actor self) public override IActivity Tick(Actor self)
{ {
if (IsCanceled) return NextActivity; if (IsCanceled) return NextActivity;
if (!target.IsValid) return NextActivity; if (target == null || !target.IsInWorld || target.IsDead()) return NextActivity;
if ((target.Actor.Location - self.Location).Length > 1) if( !target.Trait<IOccupySpace>().OccupiedCells().Any( x => x == self.Location ) )
return NextActivity; return NextActivity;
var health = target.Actor.Trait<Health>(); var health = target.Trait<Health>();
if (health.DamageState == DamageState.Undamaged) if (health.DamageState == DamageState.Undamaged)
return NextActivity; return NextActivity;
target.Actor.InflictDamage(self, -health.MaxHP, null); target.InflictDamage(self, -health.MaxHP, null);
self.Destroy(); self.Destroy();
return NextActivity; return this;
} }
} }
} }