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

rename for consistency

Browse Source
This commit is contained in:
Matthias Mailänder
2015-06-20 12:11:45 +02:00
parent 50e5e9df24
commit 0f8d22c9a6
7 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Sound/AnnounceOnBuild.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
public class AnnounceOnBuildInfo : ITraitInfo
{
[Desc("Voice to use when built/trained.")]
public readonly string BuildVoice = "Build";
[VoiceReference] public readonly string Voice = "Build";
public object Create(ActorInitializer init) { return new AnnounceOnBuild(init.Self, this); }
}
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits
public void BuildingComplete(Actor self)
{
self.PlayVoice(info.BuildVoice);
self.PlayVoice(info.Voice);
}
}
}

4
OpenRA.Mods.Common/Traits/Sound/AnnounceOnKill.cs
View File

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

4
OpenRA.Mods.Common/Traits/Sound/DeathSounds.cs
View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Traits
public class DeathSoundsInfo : ITraitInfo
{
[Desc("Death notification voice.")]
public readonly string DeathSound = "Die";
[VoiceReference] public readonly string Voice = "Die";
[Desc("Multiply volume with this factor.")]
public readonly float VolumeMultiplier = 1f;
@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
return;
if (info.DeathTypes.Intersect(e.Warhead.DamageTypes).Any())
self.PlayVoiceLocal(info.DeathSound, info.VolumeMultiplier);
self.PlayVoiceLocal(info.Voice, info.VolumeMultiplier);
}
}
}