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

Add support for random sounds to AmbientSound

Browse Source
This commit is contained in:
reaperrr
2017-04-22 13:05:51 +02:00
parent d9eb224c77
commit 1e63013eb1
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Sound/AmbientSound.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits.Sound
class AmbientSoundInfo : ConditionalTraitInfo
{
[FieldLoader.Require]
public readonly string SoundFile = null;
public readonly string[] SoundFiles = null;
[Desc("Initial delay (in ticks) before playing the sound for the first time.",
"Two values indicate a random delay range.")]
@@ -74,16 +74,18 @@ namespace OpenRA.Mods.Common.Traits.Sound
void StartSound(Actor self)
{
var sound = Info.SoundFiles.RandomOrDefault(Game.CosmeticRandom);
ISound s;
if (self.OccupiesSpace != null)
{
cachedPosition = self.CenterPosition;
s = loop ? Game.Sound.PlayLooped(SoundType.World, Info.SoundFile, cachedPosition) :
Game.Sound.Play(SoundType.World, Info.SoundFile, self.CenterPosition);
s = loop ? Game.Sound.PlayLooped(SoundType.World, sound, cachedPosition) :
Game.Sound.Play(SoundType.World, sound, self.CenterPosition);
}
else
s = loop ? Game.Sound.PlayLooped(SoundType.World, Info.SoundFile) :
Game.Sound.Play(SoundType.World, Info.SoundFile);
s = loop ? Game.Sound.PlayLooped(SoundType.World, sound) :
Game.Sound.Play(SoundType.World, sound);
currentSounds.Add(s);
}

5
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -596,6 +596,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
RenameNodeKey(node, "-AcceptsDeliveredCash");
}
// Add random sound support to AmbientSound
if (engineVersion < 20170422)
if (node.Key == "SoundFile" && parent.Key.StartsWith("AmbientSound", StringComparison.Ordinal))
RenameNodeKey(node, "SoundFiles");
UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
}