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

Rename Stance to PlayerRelationship

Browse Source
This commit is contained in:
abcdefg30
2020-09-25 16:22:37 +02:00
committed by Paul Chote
parent 672172d1f1
commit eda9966d27
63 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/ActorExts.cs
View File

@@ -37,11 +37,11 @@ namespace OpenRA.Mods.Common
public static bool AppearsFriendlyTo(this Actor self, Actor toActor)
{
var stance = toActor.Owner.Stances[self.Owner];
if (stance == Stance.Ally)
if (stance == PlayerRelationship.Ally)
return true;
if (self.EffectiveOwner != null && self.EffectiveOwner.Disguised && !toActor.Info.HasTraitInfo<IgnoresDisguiseInfo>())
return toActor.Owner.Stances[self.EffectiveOwner.Owner] == Stance.Ally;
return toActor.Owner.Stances[self.EffectiveOwner.Owner] == PlayerRelationship.Ally;
return false;
}
@@ -49,13 +49,13 @@ namespace OpenRA.Mods.Common
public static bool AppearsHostileTo(this Actor self, Actor toActor)
{
var stance = toActor.Owner.Stances[self.Owner];
if (stance == Stance.Ally)
if (stance == PlayerRelationship.Ally)
return false; /* otherwise, we'll hate friendly disguised spies */
if (self.EffectiveOwner != null && self.EffectiveOwner.Disguised && !toActor.Info.HasTraitInfo<IgnoresDisguiseInfo>())
return toActor.Owner.Stances[self.EffectiveOwner.Owner] == Stance.Enemy;
return toActor.Owner.Stances[self.EffectiveOwner.Owner] == PlayerRelationship.Enemy;
return stance == Stance.Enemy;
return stance == PlayerRelationship.Enemy;
}
public static void NotifyBlocker(this Actor self, IEnumerable<Actor> blockers)