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

Moved Voice-related extensions to VoiceExts.

Browse Source 
Note: This is a work-around until Selectable can be moved to Mods.Common, which is when the voice extensions should be moved back to ActorExts.

Pulled phrase check before foreach in PlayVoice ActorExts.
Removed superflous actor parameter from PlayVoice/PlayVoiceLocal.

Simplified PlayVoice extensions.

variant is no longer customisable, as all current usages use self.Owner.Country.Race anyway.
This commit is contained in:
reaperrr
2015-05-21 15:48:30 +02:00
parent b9e8406aeb
commit 3777a8bca9
8 changed files with 80 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Traits
{
public void BuildingComplete(Actor self)
{
self.PlayVoice(self, "Build", self.Owner.Country.Race);
self.PlayVoice("Build");
}
}
}

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

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Traits
if (e.DamageState == DamageState.Dead && damaged != e.Attacker)
{
if (self.World.WorldTick - lastAnnounce > info.Interval * 25)
self.PlayVoice(self, "Kill", self.Owner.Country.Race);
self.PlayVoice("Kill");
lastAnnounce = self.World.WorldTick;
}

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

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
if (info.DeathTypes.Contains(e.Warhead.DeathType) || (!info.DeathTypes.Any() &&
!self.Info.Traits.WithInterface<DeathSoundsInfo>().Any(dsi => dsi.DeathTypes.Contains(e.Warhead.DeathType))))
self.PlayVoiceLocal(self, info.DeathSound, self.Owner.Country.Race, info.VolumeMultiplier);
self.PlayVoiceLocal(info.DeathSound, info.VolumeMultiplier);
}
}
}