some more overloads etc
This commit is contained in:
committed by
Chris Forbes
parent
c313920c7c
commit
981e57bde8
@@ -4,48 +4,58 @@ namespace OpenRA.Mods.RA
|
||||
{
|
||||
public static class ActorExts
|
||||
{
|
||||
public static bool AppearsFriendlyTo(this Actor self, Actor toActor)
|
||||
public static bool AppearsFriendlyTo(this Actor self, Player toPlayer)
|
||||
{
|
||||
if (self.HasTrait<Spy>())
|
||||
{
|
||||
if (self.Trait<Spy>().Disguised)
|
||||
{
|
||||
//TODO: check if we can see through disguise
|
||||
if ( toActor.Owner.Stances[self.Trait<Spy>().disguisedAsPlayer] == Stance.Ally)
|
||||
if ( toPlayer.Stances[self.Trait<Spy>().disguisedAsPlayer] == Stance.Ally)
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (toActor.Owner.Stances[self.Owner] == Stance.Ally)
|
||||
if (toPlayer.Stances[self.Owner] == Stance.Ally)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return toActor.Owner.Stances[self.Owner] == Stance.Ally;
|
||||
return toPlayer.Stances[self.Owner] == Stance.Ally;
|
||||
}
|
||||
|
||||
public static bool AppearsHostileTo(this Actor self, Actor toActor)
|
||||
public static bool AppearsHostileTo(this Actor self, Player toPlayer)
|
||||
{
|
||||
if (self.HasTrait<Spy>())
|
||||
{
|
||||
if (toActor.Owner.Stances[self.Owner] == Stance.Ally)
|
||||
if (toPlayer.Stances[self.Owner] == Stance.Ally)
|
||||
return false;
|
||||
|
||||
if (self.Trait<Spy>().Disguised)
|
||||
{
|
||||
//TODO: check if we can see through disguise
|
||||
if ( toActor.Owner.Stances[self.Trait<Spy>().disguisedAsPlayer] == Stance.Enemy)
|
||||
//TODO: check if we can see through disguise
|
||||
if (toPlayer.Stances[self.Trait<Spy>().disguisedAsPlayer] == Stance.Enemy)
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (toActor.Owner.Stances[self.Owner] == Stance.Enemy)
|
||||
{
|
||||
if (toPlayer.Stances[self.Owner] == Stance.Enemy)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return toActor.Owner.Stances[self.Owner] == Stance.Enemy;
|
||||
}
|
||||
}
|
||||
return toPlayer.Stances[self.Owner] == Stance.Enemy;
|
||||
}
|
||||
|
||||
public static bool AppearsHostileTo(this Actor self, Actor toActor)
|
||||
{
|
||||
return AppearsHostileTo(self, toActor.Owner);
|
||||
}
|
||||
|
||||
public static bool AppearsFriendlyTo(this Actor self, Actor toActor)
|
||||
{
|
||||
return AppearsFriendlyTo(self, toActor.Owner);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user