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

Merge pull request #4045 from Mailaender/pilot-nudge

Browse Source 
Cleanup EjectOnDeath and nudge pilots
This commit is contained in:
Paul Chote
2013-11-02 15:42:29 -07:00
parent 2921473166 4012ca7d17
commit 133b79e2c2
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/EjectOnDeath.cs
View File

@@ -10,10 +10,12 @@
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Effects;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
[Desc("Eject a ground soldier or a paratrooper while in the air.")]
public class EjectOnDeathInfo : TraitInfo<EjectOnDeath> public class EjectOnDeathInfo : TraitInfo<EjectOnDeath>
{ {
[ActorReference] [ActorReference]
@@ -38,6 +40,8 @@ namespace OpenRA.Mods.RA
return; return;
var cp = self.CenterPosition; var cp = self.CenterPosition;
if ((cp.Z > 0 && !info.EjectInAir) || (cp.Z == 0 && !info.EjectOnGround))
return;
var pilot = self.World.CreateActor(false, info.PilotActor.ToLowerInvariant(), var pilot = self.World.CreateActor(false, info.PilotActor.ToLowerInvariant(),
new TypeDictionary { new OwnerInit(self.Owner), new LocationInit(self.Location) }); new TypeDictionary { new OwnerInit(self.Owner), new LocationInit(self.Location) });
@@ -51,7 +55,12 @@ namespace OpenRA.Mods.RA
Sound.Play(info.ChuteSound, cp); Sound.Play(info.ChuteSound, cp);
} }
else else
{
self.World.AddFrameEndTask(w => w.Add(pilot)); self.World.AddFrameEndTask(w => w.Add(pilot));
var pilotMobile = pilot.TraitOrDefault<Mobile>();
if (pilotMobile != null)
pilotMobile.Nudge(pilot, pilot, true);
}
} }
else else
pilot.Destroy(); pilot.Destroy();