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

Remove WorldUtils.AreMutualAllies

Browse Source
This commit is contained in:
abcdefg30
2020-11-14 13:00:10 +01:00
committed by Matthias Mailänder
parent d6c0926856
commit e7e50cc101
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/ProximityCapturable.cs
View File

@@ -120,12 +120,6 @@ namespace OpenRA.Mods.Common.Traits
return pc != null && pc.Types.Overlaps(Info.CaptorTypes);
}
bool IsClear(Actor self, Player captorOwner)
{
return actorsInRange
.All(a => a.Owner == captorOwner || WorldUtils.AreMutualAllies(a.Owner, captorOwner));
}
void UpdateOwnership()
{
if (Captured && Info.Permanent)
@@ -153,7 +147,7 @@ namespace OpenRA.Mods.Common.Traits
{
if (Info.MustBeClear)
{
var isClear = IsClear(Self, captor.Owner);
var isClear = actorsInRange.All(a => captor.Owner.RelationshipWith(a.Owner) == PlayerRelationship.Ally);
// An enemy unit has wandered into the area, so we've lost control of it.
if (Captured && !isClear)