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

Merge pull request #8784 from Mailaender/heli-drop-sounds

Browse Source 
Added helicopter takeoff and landing sound
This commit is contained in:
abcdefg30
2015-08-04 14:53:00 +02:00
parent d0fb08a48c 25ee5f7287
commit 582c93dda5
5 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ namespace OpenRA.Mods.Common.Activities
readonly Target target;
readonly WDist maxRange;
readonly WDist minRange;
bool playedSound;
public HeliFly(Actor self, Target t)
{
@@ -53,6 +54,12 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled || !target.IsValidFor(self))
return NextActivity;
if (!playedSound && helicopter.Info.TakeoffSound != null && self.IsAtGroundLevel())
{
Sound.Play(helicopter.Info.TakeoffSound);
playedSound = true;
}
if (AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))
return this;

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

@@ -16,14 +16,13 @@ namespace OpenRA.Mods.Common.Activities
public class HeliLand : Activity
{
readonly Helicopter helicopter;
readonly WDist landAltitude;
bool requireSpace;
bool playedSound;
public HeliLand(Actor self, bool requireSpace)
{
this.requireSpace = requireSpace;
helicopter = self.Trait<Helicopter>();
landAltitude = helicopter.Info.LandAltitude;
}
public override Activity Tick(Actor self)
@@ -34,7 +33,13 @@ namespace OpenRA.Mods.Common.Activities
if (requireSpace && !helicopter.CanLand(self.Location))
return this;
if (HeliFly.AdjustAltitude(self, helicopter, landAltitude))
if (!playedSound && helicopter.Info.LandingSound != null && !self.IsAtGroundLevel())
{
Sound.Play(helicopter.Info.LandingSound);
playedSound = true;
}
if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.LandAltitude))
return this;
return NextActivity;

3
OpenRA.Mods.Common/Traits/Air/Helicopter.cs
View File

@@ -30,6 +30,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("How fast the helicopter ascends or descends.")]
public readonly WDist AltitudeVelocity = new WDist(43);
public readonly string TakeoffSound = null;
public readonly string LandingSound = null;
public override object Create(ActorInitializer init) { return new Helicopter(init, this); }
}