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

Spawn ejected pilots inside a FrameEndTask.

Browse Source
This commit is contained in:
Paul Chote
2019-11-16 20:08:57 +00:00
committed by abcdefg30
parent 04912ea996
commit 6b1e81a7b5
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
OpenRA.Mods.Common/Traits/EjectOnDeath.cs
View File

@@ -58,47 +58,47 @@ namespace OpenRA.Mods.Common.Traits
if ((inAir && !Info.EjectInAir) || (!inAir && !Info.EjectOnGround)) if ((inAir && !Info.EjectInAir) || (!inAir && !Info.EjectOnGround))
return; return;
if (!Info.AllowUnsuitableCell) self.World.AddFrameEndTask(w =>
{ {
var pilotInfo = self.World.Map.Rules.Actors[Info.PilotActor.ToLowerInvariant()]; if (!Info.AllowUnsuitableCell)
var pilotPositionable = pilotInfo.TraitInfo<IPositionableInfo>();
if (!pilotPositionable.CanEnterCell(self.World, null, self.Location))
return;
}
var td = new TypeDictionary
{
new OwnerInit(self.Owner),
new LocationInit(self.Location),
};
// If airborne, offset the spawn location so the pilot doesn't drop on another infantry's head
var spawnPos = cp;
if (inAir)
{
var subCell = self.World.ActorMap.FreeSubCell(self.Location);
if (subCell != SubCell.Invalid)
{ {
td.Add(new SubCellInit(subCell)); var pilotInfo = self.World.Map.Rules.Actors[Info.PilotActor.ToLowerInvariant()];
spawnPos = self.World.Map.CenterOfSubCell(self.Location, subCell) + new WVec(0, 0, spawnPos.Z); var pilotPositionable = pilotInfo.TraitInfo<IPositionableInfo>();
if (!pilotPositionable.CanEnterCell(self.World, null, self.Location))
return;
} }
}
td.Add(new CenterPositionInit(spawnPos)); var td = new TypeDictionary
{
new OwnerInit(self.Owner),
new LocationInit(self.Location),
};
var pilot = self.World.CreateActor(true, Info.PilotActor.ToLowerInvariant(), td); // If airborne, offset the spawn location so the pilot doesn't drop on another infantry's head
var spawnPos = cp;
if (inAir)
{
var subCell = self.World.ActorMap.FreeSubCell(self.Location);
if (subCell != SubCell.Invalid)
{
td.Add(new SubCellInit(subCell));
spawnPos = self.World.Map.CenterOfSubCell(self.Location, subCell) + new WVec(0, 0, spawnPos.Z);
}
}
if (!inAir) td.Add(new CenterPositionInit(spawnPos));
{
self.World.AddFrameEndTask(w => var pilot = self.World.CreateActor(true, Info.PilotActor.ToLowerInvariant(), td);
if (!inAir)
{ {
var pilotMobile = pilot.TraitOrDefault<Mobile>(); var pilotMobile = pilot.TraitOrDefault<Mobile>();
if (pilotMobile != null) if (pilotMobile != null)
pilotMobile.Nudge(pilot); pilotMobile.Nudge(pilot);
}); }
} else
else Game.Sound.Play(SoundType.World, Info.ChuteSound, cp);
Game.Sound.Play(SoundType.World, Info.ChuteSound, cp); });
} }
} }
} }