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

Fixed: ProximityCaptureable now allows allies nearby

Browse Source
This commit is contained in:
geckosoft
2010-11-16 03:15:34 +01:00
committed by Chris Forbes
parent 0af653b101
commit 65ac607d90
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.RA/ProximityCapturable.cs
View File

@@ -58,23 +58,28 @@ namespace OpenRA.Mods.RA
if (!Captured) if (!Captured)
{ {
if (MustBeClear && playersNear != 1) return;
var captor = GetInRange(self, OriginalOwner, Range); var captor = GetInRange(self, OriginalOwner, Range);
if (captor != null) ChangeOwnership(self, captor, OriginalOwner); if (captor != null)
{
if (MustBeClear && !IsClear(self, captor.Owner, Range, OriginalOwner)) return;
ChangeOwnership(self, captor, OriginalOwner);
}
return; return;
} }
// if the area must be clear, and there is more than 1 player nearby => return ownership to default // if the area must be clear, and there is more than 1 player nearby => return ownership to default
if (MustBeClear && playersNear != 1) if (MustBeClear && !IsClear(self, Owner, Range, OriginalOwner))
{ {
// Revert Ownership // Revert Ownership
ChangeOwnership(self, Owner, OriginalOwner); ChangeOwnership(self, Owner, OriginalOwner);
return;
} }
// See if the 'temporary' owner still is in range // See if the 'temporary' owner still is in range
else if (!IsStillInRange(self, self.Owner, Range)) if (!IsStillInRange(self, self.Owner, Range))
{ {
// no.. So find a new one // no.. So find a new one
var captor = GetInRange(self, OriginalOwner, Range); var captor = GetInRange(self, OriginalOwner, Range);
@@ -132,6 +137,13 @@ namespace OpenRA.Mods.RA
}); });
} }
public static bool IsClear(Actor self, Player currentOwner, int range, Player originalOwner)
{
var unitsInRange = self.World.FindUnitsInCircle(self.CenterLocation, Game.CellSize * range);
return unitsInRange.Where(a => !a.Destroyed && a.IsInWorld && a != self && !a.Owner.NonCombatant && a.Owner != originalOwner).Where(a => a.Owner != currentOwner).All(a => (a.Owner.Stances[currentOwner] == Stance.Ally) && (currentOwner.Stances[a.Owner] == Stance.Ally));
}
// TODO exclude other NeutralActor that arent permanent // TODO exclude other NeutralActor that arent permanent
public static bool IsStillInRange(Actor self, Player currentOwner, int range) public static bool IsStillInRange(Actor self, Player currentOwner, int range)
{ {