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

Add Map.DistanceAboveTerrain(WPos) and Actor.IsAtGroundLevel() extension method

Browse Source
This commit is contained in:
Taryn Hill
2015-08-01 07:53:14 -05:00
parent 7066254887
commit 6fa1f757b0
8 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ namespace OpenRA.Mods.Common.Traits
public bool CanLoad(Actor self, Actor a)
{
return (reserves.Contains(a) || HasSpace(GetWeight(a))) && self.CenterPosition.Z == 0;
return (reserves.Contains(a) || HasSpace(GetWeight(a))) && self.IsAtGroundLevel();
}
internal bool ReserveSpace(Actor a)

7
OpenRA.Mods.Common/Traits/Crates/Crate.cs
View File

@@ -189,11 +189,8 @@ namespace OpenRA.Mods.Common.Traits
public bool CrushableBy(string[] crushClasses, Player owner)
{
// Crate can only be crushed if it is not in the air or underground
if (CenterPosition.Z != 0)
return false;
return crushClasses.Contains(info.CrushClass);
// Crate can only be crushed if it is not in the air.
return self.IsAtGroundLevel() && crushClasses.Contains(info.CrushClass);
}
public void AddedToWorld(Actor self)

4
OpenRA.Mods.Common/Traits/Crushable.cs
View File

@@ -65,8 +65,8 @@ namespace OpenRA.Mods.Common.Traits
public bool CrushableBy(string[] crushClasses, Player crushOwner)
{
// Only make actor crushable if it is on the ground
if (self.CenterPosition.Z != 0)
// Only make actor crushable if it is on the ground.
if (!self.IsAtGroundLevel())
return false;
if (!info.CrushedByFriendlies && crushOwner.IsAlliedWith(self.Owner))

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

@@ -65,7 +65,8 @@ namespace OpenRA.Mods.Common.Traits
return;
var cp = self.CenterPosition;
if ((cp.Z > 0 && !info.EjectInAir) || (cp.Z == 0 && !info.EjectOnGround))
var inAir = !self.IsAtGroundLevel();
if ((inAir && !info.EjectInAir) || (!inAir && !info.EjectOnGround))
return;
var pilot = self.World.CreateActor(false, info.PilotActor.ToLowerInvariant(),
@@ -73,7 +74,7 @@ namespace OpenRA.Mods.Common.Traits
if (info.AllowUnsuitableCell || IsSuitableCell(self, pilot))
{
if (cp.Z > 0)
if (inAir)
{
self.World.AddFrameEndTask(w =>
{

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

@@ -565,7 +565,7 @@ namespace OpenRA.Mods.Common.Traits
public void FinishedMoving(Actor self)
{
// Only make actor crush if it is on the ground
if (self.CenterPosition.Z != 0)
if (!self.IsAtGroundLevel())
return;
var crushables = self.World.ActorMap.GetUnitsAt(ToCell).Where(a => a != self)