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

Disallow sound/radar notifications for neutral actors via a configurable field on the trait

Browse Source
This commit is contained in:
penev92
2015-03-21 12:03:41 +02:00
parent 55e04a44c8
commit 328e329fe7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Sound/AnnounceOnSeen.cs
View File

@@ -22,6 +22,8 @@ namespace OpenRA.Mods.Common.Traits
public readonly string Notification = null; public readonly string Notification = null;
public readonly bool AnnounceNeutrals = false;
public object Create(ActorInitializer init) { return new AnnounceOnSeen(init.Self, this); } public object Create(ActorInitializer init) { return new AnnounceOnSeen(init.Self, this); }
} }
@@ -42,6 +44,12 @@ namespace OpenRA.Mods.Common.Traits
if (!playNotification || discoverer != self.World.RenderPlayer) if (!playNotification || discoverer != self.World.RenderPlayer)
return; return;
// Hack to disable notifications for neutral actors so some custom maps don't need fixing
if (!Info.AnnounceNeutrals &&
((self.EffectiveOwner != null && discoverer.Stances[self.EffectiveOwner.Owner] != Stance.Enemy)
|| discoverer.Stances[self.Owner] != Stance.Enemy))
return;
// Audio notification // Audio notification
if (discoverer != null && !string.IsNullOrEmpty(Info.Notification)) if (discoverer != null && !string.IsNullOrEmpty(Info.Notification))
Sound.PlayNotification(self.World.Map.Rules, discoverer, "Speech", Info.Notification, discoverer.Country.Race); Sound.PlayNotification(self.World.Map.Rules, discoverer, "Speech", Info.Notification, discoverer.Country.Race);