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

Add Sound.Play overloads that play a random sound from a list

Browse Source
This commit is contained in:
abcdefg30
2019-04-07 23:20:20 +02:00
committed by reaperrr
parent 5f6c8ba5d3
commit 1bb319425b
15 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Sound/Sound.cs
View File

@@ -147,6 +147,16 @@ namespace OpenRA
public ISound PlayLooped(SoundType type, string name) { return Play(type, null, name, true, WPos.Zero, 1f, true); }
public ISound PlayLooped(SoundType type, string name, WPos pos) { return Play(type, null, name, false, pos, 1f, true); }
public ISound Play(SoundType type, string[] names, World world, Player player = null, float volumeModifier = 1f)
{
return Play(type, player, names.Random(world.LocalRandom), true, WPos.Zero, volumeModifier);
}
public ISound Play(SoundType type, string[] names, World world, WPos pos, Player player = null, float volumeModifier = 1f)
{
return Play(type, player, names.Random(world.LocalRandom), false, pos, volumeModifier);
}
public void PlayVideo(byte[] raw, int channels, int sampleBits, int sampleRate)
{
StopVideo();

2
OpenRA.Mods.Cnc/Projectiles/IonCannon.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Cnc.Effects
anim.PlayThen(sequence, () => Finish(world));
if (weapon.Report != null && weapon.Report.Any())
Game.Sound.Play(SoundType.World, weapon.Report.Random(firedBy.World.SharedRandom), launchPos);
Game.Sound.Play(SoundType.World, weapon.Report, world, launchPos);
}
public void Tick(World world)

2
OpenRA.Mods.Common/Activities/Air/Fly.cs
View File

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.Common.Activities
if (!soundPlayed && aircraft.Info.TakeoffSounds.Length > 0 && self.IsAtGroundLevel())
{
Game.Sound.Play(SoundType.World, aircraft.Info.TakeoffSounds.Random(self.World.SharedRandom), aircraft.CenterPosition);
Game.Sound.Play(SoundType.World, aircraft.Info.TakeoffSounds, self.World, aircraft.CenterPosition);
soundPlayed = true;
}

2
OpenRA.Mods.Common/Activities/Air/HeliFly.cs
View File

@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Activities
if (!soundPlayed && aircraft.Info.TakeoffSounds.Length > 0 && self.IsAtGroundLevel())
{
Game.Sound.Play(SoundType.World, aircraft.Info.TakeoffSounds.Random(self.World.SharedRandom), aircraft.CenterPosition);
Game.Sound.Play(SoundType.World, aircraft.Info.TakeoffSounds, self.World, aircraft.CenterPosition);
soundPlayed = true;
}

2
OpenRA.Mods.Common/Activities/Air/HeliLand.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Activities
if (!soundPlayed && aircraft.Info.LandingSounds.Length > 0 && !self.IsAtGroundLevel())
{
Game.Sound.Play(SoundType.World, aircraft.Info.LandingSounds.Random(self.World.SharedRandom), aircraft.CenterPosition);
Game.Sound.Play(SoundType.World, aircraft.Info.LandingSounds, self.World, aircraft.CenterPosition);
soundPlayed = true;
}

2
OpenRA.Mods.Common/Activities/Air/Land.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Activities
if (!soundPlayed && aircraft.Info.LandingSounds.Length > 0 && !self.IsAtGroundLevel())
{
Game.Sound.Play(SoundType.World, aircraft.Info.LandingSounds.Random(self.World.SharedRandom), aircraft.CenterPosition);
Game.Sound.Play(SoundType.World, aircraft.Info.LandingSounds, self.World, aircraft.CenterPosition);
soundPlayed = true;
}

2
OpenRA.Mods.Common/Projectiles/NukeLaunch.cs
View File

@@ -74,7 +74,7 @@ namespace OpenRA.Mods.Common.Effects
{
anim.PlayRepeating(upSequence);
if (weapon.Report != null && weapon.Report.Any())
Game.Sound.Play(SoundType.World, weapon.Report.Random(firedBy.World.SharedRandom), pos);
Game.Sound.Play(SoundType.World, weapon.Report, world, pos);
world.ScreenMap.Add(this, pos, anim.Image);
isLaunched = true;

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

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCashTransfer.OnAcceptingCash(Actor self, Actor donor)
{
if (info.Sounds.Length > 0)
Game.Sound.Play(SoundType.World, info.Sounds.Random(self.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, info.Sounds, self.World, self.CenterPosition);
}
void INotifyCashTransfer.OnDeliveringCash(Actor self, Actor acceptor) { }

11
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -327,10 +327,10 @@ namespace OpenRA.Mods.Common.Traits
self.World.Add(projectile);
if (args.Weapon.Report != null && args.Weapon.Report.Any())
Game.Sound.Play(SoundType.World, args.Weapon.Report.Random(self.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, args.Weapon.Report, self.World, self.CenterPosition);
if (Burst == args.Weapon.Burst && args.Weapon.StartBurstReport != null && args.Weapon.StartBurstReport.Any())
Game.Sound.Play(SoundType.World, args.Weapon.StartBurstReport.Random(self.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, args.Weapon.StartBurstReport, self.World, self.CenterPosition);
foreach (var na in notifyAttacks)
na.Attacking(self, target, this, barrel);
@@ -356,12 +356,7 @@ namespace OpenRA.Mods.Common.Traits
Burst = Weapon.Burst;
if (Weapon.AfterFireSound != null && Weapon.AfterFireSound.Any())
{
ScheduleDelayedAction(Weapon.AfterFireSoundDelay, () =>
{
Game.Sound.Play(SoundType.World, Weapon.AfterFireSound.Random(self.World.SharedRandom), self.CenterPosition);
});
}
ScheduleDelayedAction(Weapon.AfterFireSoundDelay, () => Game.Sound.Play(SoundType.World, Weapon.AfterFireSound, self.World, self.CenterPosition));
foreach (var nbc in notifyBurstComplete)
nbc.FiredBurst(self, target, this);

4
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeploy.cs
View File

@@ -222,7 +222,7 @@ namespace OpenRA.Mods.Common.Traits
return;
if (Info.DeploySounds != null && Info.DeploySounds.Any())
Game.Sound.Play(SoundType.World, Info.DeploySounds.Random(self.World.LocalRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, Info.DeploySounds, self.World, self.CenterPosition);
// Revoke condition that is applied while undeployed.
if (!init)
@@ -246,7 +246,7 @@ namespace OpenRA.Mods.Common.Traits
return;
if (Info.UndeploySounds != null && Info.UndeploySounds.Any())
Game.Sound.Play(SoundType.World, Info.UndeploySounds.Random(self.World.LocalRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, Info.UndeploySounds, self.World, self.CenterPosition);
if (!init)
OnUndeployStarted();

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

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCashTransfer.OnDeliveringCash(Actor self, Actor acceptor)
{
if (info.Sounds.Length > 0)
Game.Sound.Play(SoundType.World, info.Sounds.Random(self.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, info.Sounds, self.World, self.CenterPosition);
}
public class DeliversCashOrderTargeter : UnitOrderTargeter

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

@@ -110,7 +110,7 @@ namespace OpenRA.Mods.Common.Traits
var source = Info.DamageSource == DamageSource.Self ? self : e.Attacker;
if (weapon.Report != null && weapon.Report.Any())
Game.Sound.Play(SoundType.World, weapon.Report.Random(source.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, weapon.Report, self.World, self.CenterPosition);
if (Info.Type == ExplosionType.Footprint && buildingInfo != null)
{

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

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits.Sound
void PlaySound(Actor self)
{
if (info.Sounds.Any())
Game.Sound.Play(SoundType.World, info.Sounds.Random(self.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, info.Sounds, self.World, self.CenterPosition);
}
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)

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

@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits
self.World.Add(projectile);
if (args.Weapon.Report != null && args.Weapon.Report.Any())
Game.Sound.Play(SoundType.World, args.Weapon.Report.Random(self.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, args.Weapon.Report, self.World, self.CenterPosition);
}
});
}

2
OpenRA.Mods.D2k/Traits/SpiceBloom.cs
View File

@@ -157,7 +157,7 @@ namespace OpenRA.Mods.D2k.Traits
self.World.Add(projectile);
if (args.Weapon.Report != null && args.Weapon.Report.Any())
Game.Sound.Play(SoundType.World, args.Weapon.Report.Random(self.World.SharedRandom), self.CenterPosition);
Game.Sound.Play(SoundType.World, args.Weapon.Report, self.World, self.CenterPosition);
}
});
}