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

Don't allow actors to disguise themselves as themselves

Browse Source
This commit is contained in:
abcdefg30
2024-10-28 20:41:49 +01:00
committed by Gustas Kažukauskas
parent 76cbd5582d
commit d136ccc350
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenRA.Mods.Cnc/Traits/Disguise.cs
View File

@@ -171,19 +171,39 @@ namespace OpenRA.Mods.Cnc.Traits
var targetDisguise = target.TraitOrDefault<Disguise>();
if (targetDisguise != null && targetDisguise.Disguised)
{
AsPlayer = targetDisguise.AsPlayer;
AsActor = targetDisguise.AsActor;
AsTooltipInfo = targetDisguise.AsTooltipInfo;
// Don't disguise as yourself
if (targetDisguise.AsActor.Name == self.Info.Name && targetDisguise.AsPlayer == self.Owner)
{
AsTooltipInfo = null;
AsPlayer = null;
AsActor = self.Info;
}
else
{
AsPlayer = targetDisguise.AsPlayer;
AsActor = targetDisguise.AsActor;
AsTooltipInfo = targetDisguise.AsTooltipInfo;
}
}
else
{
var tooltip = target.TraitsImplementing<ITooltip>().FirstEnabledTraitOrDefault();
if (tooltip == null)
throw new ArgumentException("Missing tooltip or invalid target.", nameof(target));
// Don't disguise as yourself
if (target.Info.Name == self.Info.Name && target.Owner == self.Owner)
{
AsTooltipInfo = null;
AsPlayer = null;
AsActor = self.Info;
}
else
{
var tooltip = target.TraitsImplementing<ITooltip>().FirstEnabledTraitOrDefault();
if (tooltip == null)
throw new ArgumentException("Missing tooltip or invalid target.", nameof(target));
AsPlayer = tooltip.Owner;
AsActor = target.Info;
AsTooltipInfo = tooltip.TooltipInfo;
AsPlayer = tooltip.Owner;
AsActor = target.Info;
AsTooltipInfo = tooltip.TooltipInfo;
}
}
}
else