86b9227577
Since AddCellsToPlayerShroud only adds for players with a valid relationship, we can skip a dictionary lookup in RemoveSource by only attempting the remove if the relationship check passes as well.
99 lines
2.8 KiB
C#
99 lines
2.8 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright (c) The OpenRA Developers and Contributors
|
|
* This file is part of OpenRA, which is free software. It is made
|
|
* available to you under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, either version 3 of
|
|
* the License, or (at your option) any later version. For more
|
|
* information, see COPYING.
|
|
*/
|
|
#endregion
|
|
|
|
using OpenRA.Traits;
|
|
|
|
namespace OpenRA.Mods.Common.Traits
|
|
{
|
|
[Desc("Reveals shroud and fog across the whole map while active.")]
|
|
public class RevealsMapInfo : ConditionalTraitInfo
|
|
{
|
|
[Desc("Relationships the watching player needs to see the shroud removed.")]
|
|
public readonly PlayerRelationship ValidRelationships = PlayerRelationship.Ally;
|
|
|
|
[Desc("Can this actor reveal shroud generated by the `" + nameof(CreatesShroud) + "` trait?")]
|
|
public readonly bool RevealGeneratedShroud = true;
|
|
|
|
public override object Create(ActorInitializer init) { return new RevealsMap(this); }
|
|
}
|
|
|
|
public class RevealsMap : ConditionalTrait<RevealsMapInfo>, INotifyKilled, INotifyActorDisposing, INotifyOwnerChanged
|
|
{
|
|
readonly Shroud.SourceType type;
|
|
|
|
public RevealsMap(RevealsMapInfo info)
|
|
: base(info)
|
|
{
|
|
type = info.RevealGeneratedShroud ? Shroud.SourceType.Visibility
|
|
: Shroud.SourceType.PassiveVisibility;
|
|
}
|
|
|
|
protected void AddCellsToPlayerShroud(Actor self, Player p, PPos[] uv)
|
|
{
|
|
if (!Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(p)))
|
|
return;
|
|
|
|
p.Shroud.AddSource(this, type, uv);
|
|
}
|
|
|
|
protected void RemoveCellsFromPlayerShroud(Actor self, Player p)
|
|
{
|
|
if (!Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(p)))
|
|
return;
|
|
|
|
p.Shroud.RemoveSource(this);
|
|
}
|
|
|
|
protected PPos[] ProjectedCells(Actor self)
|
|
{
|
|
return self.World.Map.ProjectedCells;
|
|
}
|
|
|
|
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
|
|
{
|
|
if (!IsTraitDisabled)
|
|
{
|
|
var cells = ProjectedCells(self);
|
|
foreach (var player in self.World.Players)
|
|
{
|
|
RemoveCellsFromPlayerShroud(self, player);
|
|
AddCellsToPlayerShroud(self, player, cells);
|
|
}
|
|
}
|
|
}
|
|
|
|
void INotifyActorDisposing.Disposing(Actor self)
|
|
{
|
|
foreach (var player in self.World.Players)
|
|
RemoveCellsFromPlayerShroud(self, player);
|
|
}
|
|
|
|
void INotifyKilled.Killed(Actor self, AttackInfo e)
|
|
{
|
|
foreach (var player in self.World.Players)
|
|
RemoveCellsFromPlayerShroud(self, player);
|
|
}
|
|
|
|
protected override void TraitEnabled(Actor self)
|
|
{
|
|
var cells = ProjectedCells(self);
|
|
foreach (var player in self.World.Players)
|
|
AddCellsToPlayerShroud(self, player, cells);
|
|
}
|
|
|
|
protected override void TraitDisabled(Actor self)
|
|
{
|
|
foreach (var player in self.World.Players)
|
|
RemoveCellsFromPlayerShroud(self, player);
|
|
}
|
|
}
|
|
}
|