Made AnnounceOnKill and AnnounceOnBuild voices customisable.

This commit is contained in:
reaperrr
2015-05-23 13:04:45 +02:00
parent 3777a8bca9
commit a99f69035c
2 changed files with 19 additions and 3 deletions

View File

@@ -13,13 +13,26 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Play the Build voice of this actor when trained.")] [Desc("Play the Build voice of this actor when trained.")]
public class AnnounceOnBuildInfo : TraitInfo<AnnounceOnBuild> { } public class AnnounceOnBuildInfo : ITraitInfo
{
[Desc("Voice to use when built/trained.")]
public readonly string BuildVoice = "Build";
public object Create(ActorInitializer init) { return new AnnounceOnBuild(init.Self, this); }
}
public class AnnounceOnBuild : INotifyBuildComplete public class AnnounceOnBuild : INotifyBuildComplete
{ {
readonly AnnounceOnBuildInfo info;
public AnnounceOnBuild(Actor self, AnnounceOnBuildInfo info)
{
this.info = info;
}
public void BuildingComplete(Actor self) public void BuildingComplete(Actor self)
{ {
self.PlayVoice("Build"); self.PlayVoice(info.BuildVoice);
} }
} }
} }

View File

@@ -18,6 +18,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Minimum duration (in seconds) between sound events.")] [Desc("Minimum duration (in seconds) between sound events.")]
public readonly int Interval = 5; public readonly int Interval = 5;
[Desc("Voice to use when killing something.")]
public readonly string KillVoice = "Kill";
public object Create(ActorInitializer init) { return new AnnounceOnKill(init.Self, this); } public object Create(ActorInitializer init) { return new AnnounceOnKill(init.Self, this); }
} }
@@ -39,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
if (e.DamageState == DamageState.Dead && damaged != e.Attacker) if (e.DamageState == DamageState.Dead && damaged != e.Attacker)
{ {
if (self.World.WorldTick - lastAnnounce > info.Interval * 25) if (self.World.WorldTick - lastAnnounce > info.Interval * 25)
self.PlayVoice("Kill"); self.PlayVoice(info.KillVoice);
lastAnnounce = self.World.WorldTick; lastAnnounce = self.World.WorldTick;
} }