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

Cleaned up IVoiced-related code.

Browse Source 
Added Volume control and descriptions to Voiced.

Streamline voice checks in WorldUtils and DeathSounds.
This commit is contained in:
reaperrr
2015-05-14 17:48:35 +02:00
parent 251d3e6864
commit 5f68516070
8 changed files with 57 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Selection.cs
View File

@@ -57,10 +57,10 @@ namespace OpenRA
}
}
var voicedActor = actors.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.IsInWorld && (a.TraitsImplementing<IVoiced>() != null));
var voicedActor = actors.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.IsInWorld && a.HasTrait<IVoiced>());
if (voicedActor != null)
foreach (var voice in voicedActor.TraitsImplementing<IVoiced>())
voice.PlayVoice("Select", voicedActor, voicedActor.Owner.Country.Race);
voice.PlayVoice(voicedActor, "Select", voicedActor.Owner.Country.Race);
foreach (var a in newSelection)
foreach (var sel in a.TraitsImplementing<INotifySelected>())

7
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -111,11 +111,10 @@ namespace OpenRA.Traits
public interface IVoiced
{
bool PlayVoice(string phrase, Actor voicedActor, string variant);
bool PlayVoiceLocal(string phrase, Actor voicedActor, string variant, WPos pos, float volume);
bool HasVoices(Actor actor);
bool HasVoice(Actor actor, string voice);
string VoiceSet { get; }
bool PlayVoice(Actor self, string phrase, string variant);
bool PlayVoiceLocal(Actor self, string phrase, string variant, float volume);
bool HasVoice(Actor self, string voice);
}
public interface IDemolishableInfo { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); }

15
OpenRA.Game/WorldUtils.cs
View File

@@ -50,17 +50,14 @@ namespace OpenRA
if (o == null)
continue;
if (o.Subject.Destroyed)
var orderSubject = o.Subject;
if (orderSubject.Destroyed)
continue;
var hasVoice = o.Subject.TraitsImplementing<IVoiced>();
if (hasVoice == null)
continue;
foreach (var v in o.Subject.TraitsImplementing<IOrderVoice>())
foreach (var voice in o.Subject.TraitsImplementing<IVoiced>())
if (voice.PlayVoice(v.VoicePhraseForOrder(o.Subject, o),
o.Subject, o.Subject.Owner.Country.Race))
foreach (var voice in orderSubject.TraitsImplementing<IVoiced>())
foreach (var v in orderSubject.TraitsImplementing<IOrderVoice>())
if (voice.PlayVoice(orderSubject, v.VoicePhraseForOrder(orderSubject, o),
orderSubject.Owner.Country.Race))
return;
}
}

2
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -207,7 +207,7 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != "Unload" || IsEmpty(self))
return null;
return self.TraitsImplementing<IVoiced>().FirstOrDefault().HasVoice(self, "Unload") ? "Unload" : "Move";
return self.TraitsImplementing<IVoiced>().Any(x => x.HasVoice(self, "Unload")) ? "Unload" : "Move";
}
public bool MoveDisabled(Actor self) { return reserves.Any(); }

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

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits
public void BuildingComplete(Actor self)
{
foreach (var voiced in self.TraitsImplementing<IVoiced>())
voiced.PlayVoice("Build", self, self.Owner.Country.Race);
voiced.PlayVoice(self, "Build", self.Owner.Country.Race);
}
}
}

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
{
if (self.World.WorldTick - lastAnnounce > info.Interval * 25)
foreach (var voiced in self.TraitsImplementing<IVoiced>())
voiced.PlayVoice("Kill", self, self.Owner.Country.Race);
voiced.PlayVoice(self, "Kill", self.Owner.Country.Race);
lastAnnounce = self.World.WorldTick;
}

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

@@ -40,13 +40,10 @@ namespace OpenRA.Mods.Common.Traits
if (e.Warhead == null)
return;
var cp = self.CenterPosition;
foreach (var voiced in self.TraitsImplementing<IVoiced>())
if (info.DeathTypes.Contains(e.Warhead.DeathType) ||
(!info.DeathTypes.Any() && !self.Info.Traits.WithInterface<DeathSoundsInfo>()
.Any(dsi => dsi.DeathTypes.Contains(e.Warhead.DeathType))))
voiced.PlayVoiceLocal(info.DeathSound, self, self.Owner.Country.Race, cp, info.VolumeMultiplier);
if (info.DeathTypes.Contains(e.Warhead.DeathType) || (!info.DeathTypes.Any() &&
!self.Info.Traits.WithInterface<DeathSoundsInfo>().Any(dsi => dsi.DeathTypes.Contains(e.Warhead.DeathType))))
foreach (var voiced in self.TraitsImplementing<IVoiced>())
voiced.PlayVoiceLocal(self, info.DeathSound, self.Owner.Country.Race, info.VolumeMultiplier);
}
}
}

87
OpenRA.Mods.Common/Traits/Voiced.cs
View File

@@ -15,10 +15,15 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor has a voice.")]
public class VoicedInfo : ITraitInfo
{
[Desc("Which voice set to use.")]
[VoiceReference] public readonly string VoiceSet = null;
[Desc("Multiply volume with this factor.")]
public readonly float Volume = 1f;
public object Create(ActorInitializer init) { return new Voiced(init.Self, this); }
}
@@ -31,54 +36,40 @@ namespace OpenRA.Mods.Common.Traits
Info = info;
}
public bool PlayVoice(string phrase, Actor voicedActor, string variant)
{
if (voicedActor == null || phrase == null)
return false;
var mi = voicedActor.TraitOrDefault<IVoiced>();
if (mi == null || mi.VoiceSet == null)
return false;
var type = mi.VoiceSet.ToLowerInvariant();
return Sound.PlayPredefined(voicedActor.World.Map.Rules, null, voicedActor, type, phrase, variant, true, WPos.Zero, 1f, true);
}
public bool PlayVoiceLocal(string phrase, Actor voicedActor, string variant, WPos pos, float volume)
{
if (voicedActor == null || phrase == null)
return false;
var mi = voicedActor.TraitOrDefault<IVoiced>();
if (mi == null || mi.VoiceSet == null)
return false;
var type = mi.VoiceSet.ToLowerInvariant();
return Sound.PlayPredefined(voicedActor.World.Map.Rules, null, voicedActor, type, phrase, variant, false, pos, volume, true);
}
public bool HasVoices(Actor actor)
{
var voice = actor.TraitsImplementing<IVoiced>().FirstOrDefault();
return voice != null && voice.VoiceSet != null;
}
public bool HasVoice(Actor actor, string voice)
{
var v = GetVoices(actor);
return v != null && v.Voices.ContainsKey(voice);
}
public SoundInfo GetVoices(Actor actor)
{
var voice = actor.TraitsImplementing<IVoiced>().FirstOrDefault();
if (voice == null)
return null;
var v = voice.VoiceSet;
return (v == null) ? null : actor.World.Map.Rules.Voices[v.ToLowerInvariant()];
}
public string VoiceSet { get { return Info.VoiceSet; } }
public bool PlayVoice(Actor self, string phrase, string variant)
{
if (phrase == null)
return false;
if (string.IsNullOrEmpty(Info.VoiceSet))
return false;
var type = Info.VoiceSet.ToLowerInvariant();
var volume = Info.Volume;
return Sound.PlayPredefined(self.World.Map.Rules, null, self, type, phrase, variant, true, WPos.Zero, volume, true);
}
public bool PlayVoiceLocal(Actor self, string phrase, string variant, float volume)
{
if (phrase == null)
return false;
if (string.IsNullOrEmpty(Info.VoiceSet))
return false;
var type = Info.VoiceSet.ToLowerInvariant();
return Sound.PlayPredefined(self.World.Map.Rules, null, self, type, phrase, variant, false, self.CenterPosition, volume, true);
}
public bool HasVoice(Actor self, string voice)
{
if (string.IsNullOrEmpty(Info.VoiceSet))
return false;
var voices = self.World.Map.Rules.Voices[Info.VoiceSet.ToLowerInvariant()];
return voices != null && voices.Voices.ContainsKey(voice);
}
}
}