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

add the takeoff and landing sound

Browse Source
This commit is contained in:
Matthias Mailänder
2015-07-25 20:08:38 +02:00
parent 9c67e46226
commit 25ee5f7287
4 changed files with 25 additions and 3 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 Target target;
readonly WDist maxRange; readonly WDist maxRange;
readonly WDist minRange; readonly WDist minRange;
bool playedSound;
public HeliFly(Actor self, Target t) public HeliFly(Actor self, Target t)
{ {
@@ -53,6 +54,12 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled || !target.IsValidFor(self)) if (IsCanceled || !target.IsValidFor(self))
return NextActivity; return NextActivity;
if (!playedSound && helicopter.Info.TakeoffSound != null && self.IsAtGroundLevel())
{
Sound.Play(helicopter.Info.TakeoffSound);
playedSound = true;
}
if (AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude)) if (AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))
return this; 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 public class HeliLand : Activity
{ {
readonly Helicopter helicopter; readonly Helicopter helicopter;
readonly WDist landAltitude;
bool requireSpace; bool requireSpace;
bool playedSound;
public HeliLand(Actor self, bool requireSpace) public HeliLand(Actor self, bool requireSpace)
{ {
this.requireSpace = requireSpace; this.requireSpace = requireSpace;
helicopter = self.Trait<Helicopter>(); helicopter = self.Trait<Helicopter>();
landAltitude = helicopter.Info.LandAltitude;
} }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
@@ -34,7 +33,13 @@ namespace OpenRA.Mods.Common.Activities
if (requireSpace && !helicopter.CanLand(self.Location)) if (requireSpace && !helicopter.CanLand(self.Location))
return this; 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 this;
return NextActivity; 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.")] [Desc("How fast the helicopter ascends or descends.")]
public readonly WDist AltitudeVelocity = new WDist(43); 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); } public override object Create(ActorInitializer init) { return new Helicopter(init, this); }
} }

7
mods/ts/rules/aircraft.yaml
View File

@@ -45,6 +45,8 @@ DSHP:
Speed: 168 Speed: 168
InitialFacing: 0 InitialFacing: 0
LandableTerrainTypes: Clear LandableTerrainTypes: Clear
TakeoffSound: dropup1.aud
LandingSound: dropdwn1.aud
Health: Health:
HP: 200 HP: 200
Armor: Armor:
@@ -155,6 +157,8 @@ ORCATRAN:
Speed: 84 Speed: 84
InitialFacing: 0 InitialFacing: 0
LandableTerrainTypes: Clear LandableTerrainTypes: Clear
TakeoffSound: dropup1.aud
LandingSound: dropdwn1.aud
Health: Health:
HP: 200 HP: 200
Armor: Armor:
@@ -186,6 +190,9 @@ TRNSPORT:
Speed: 149 Speed: 149
InitialFacing: 0 InitialFacing: 0
LandableTerrainTypes: Clear LandableTerrainTypes: Clear
TakeoffSound: dropup1.aud
LandingSound: dropdwn1.aud
AltitudeVelocity: 64
Health: Health:
HP: 175 HP: 175
Armor: Armor: