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

Add condition support to ActorLostNotification.

Browse Source
This commit is contained in:
Paul Chote
2021-03-14 19:59:14 +00:00
committed by reaperrr
parent 0e270bec56
commit e63b9b4986
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Traits/Sound/ActorLostNotification.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Sound namespace OpenRA.Mods.Common.Traits.Sound
{ {
class ActorLostNotificationInfo : TraitInfo class ActorLostNotificationInfo : ConditionalTraitInfo
{ {
[NotificationReference("Speech")] [NotificationReference("Speech")]
public readonly string Notification = "UnitLost"; public readonly string Notification = "UnitLost";
@@ -23,18 +23,18 @@ namespace OpenRA.Mods.Common.Traits.Sound
public override object Create(ActorInitializer init) { return new ActorLostNotification(this); } public override object Create(ActorInitializer init) { return new ActorLostNotification(this); }
} }
class ActorLostNotification : INotifyKilled class ActorLostNotification : ConditionalTrait<ActorLostNotificationInfo>, INotifyKilled
{ {
ActorLostNotificationInfo info;
public ActorLostNotification(ActorLostNotificationInfo info) public ActorLostNotification(ActorLostNotificationInfo info)
{ : base(info) { }
this.info = info;
}
void INotifyKilled.Killed(Actor self, AttackInfo e) void INotifyKilled.Killed(Actor self, AttackInfo e)
{ {
var player = info.NotifyAll ? self.World.LocalPlayer : self.Owner; if (IsTraitDisabled)
Game.Sound.PlayNotification(self.World.Map.Rules, player, "Speech", info.Notification, self.Owner.Faction.InternalName); return;
var player = Info.NotifyAll ? self.World.LocalPlayer : self.Owner;
Game.Sound.PlayNotification(self.World.Map.Rules, player, "Speech", Info.Notification, self.Owner.Faction.InternalName);
} }
} }
} }