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

Add a ReturnToGroundLayerOnIdle flag to CustomMovementLayers

Browse Source 
Co-authored-by: Mazar Farran <farranmazar@gmail.com>
Co-authored-by: Paul Chote <paul@chote.net>
This commit is contained in:
Oliver Brakmann
2018-12-24 22:47:34 +00:00
committed by reaperrr
parent 8fc483b30b
commit 0bd00d3b7c
7 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -672,7 +672,13 @@ namespace OpenRA.Mods.Common.Traits
void INotifyBecomingIdle.OnBecomingIdle(Actor self) void INotifyBecomingIdle.OnBecomingIdle(Actor self)
{ {
if (TopLeft.Layer == 0) if (self.Location.Layer == 0)
return;
var cml = self.World.WorldActor.TraitsImplementing<ICustomMovementLayer>()
.First(l => l.Index == self.Location.Layer);
if (!cml.ReturnToGroundLayerOnIdle)
return; return;
var moveTo = ClosestGroundCell(); var moveTo = ClosestGroundCell();

1
OpenRA.Mods.Common/Traits/World/ElevatedBridgeLayer.cs
View File

@@ -72,6 +72,7 @@ namespace OpenRA.Mods.Common.Traits
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return enabled; } bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return enabled; }
byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.ElevatedBridge; } } byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.ElevatedBridge; } }
bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return true; } } bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return true; } }
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle { get { return false; } }
WPos ICustomMovementLayer.CenterOfCell(CPos cell) WPos ICustomMovementLayer.CenterOfCell(CPos cell)
{ {

1
OpenRA.Mods.Common/Traits/World/JumpjetActorLayer.cs
View File

@@ -65,6 +65,7 @@ namespace OpenRA.Mods.Common.Traits
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return li is JumpjetLocomotorInfo; } bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return li is JumpjetLocomotorInfo; }
byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.Jumpjet; } } byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.Jumpjet; } }
bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return true; } } bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return true; } }
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle { get { return true; } }
WPos ICustomMovementLayer.CenterOfCell(CPos cell) WPos ICustomMovementLayer.CenterOfCell(CPos cell)
{ {

2
OpenRA.Mods.Common/Traits/World/PathFinder.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits
return EmptyPath; return EmptyPath;
var distance = source - target; var distance = source - target;
if (distance.LengthSquared < 3 && li.CanMoveFreelyInto(world, self, target, null, CellConditions.All)) if (source.Layer == target.Layer && distance.LengthSquared < 3 && li.CanMoveFreelyInto(world, self, target, null, CellConditions.All))
return new List<CPos> { target }; return new List<CPos> { target };
List<CPos> pb; List<CPos> pb;

1
OpenRA.Mods.Common/Traits/World/SubterraneanActorLayer.cs
View File

@@ -64,6 +64,7 @@ namespace OpenRA.Mods.Common.Traits
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return li is SubterraneanLocomotorInfo; } bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return li is SubterraneanLocomotorInfo; }
byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.Subterranean; } } byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.Subterranean; } }
bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return false; } } bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return false; } }
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle { get { return true; } }
WPos ICustomMovementLayer.CenterOfCell(CPos cell) WPos ICustomMovementLayer.CenterOfCell(CPos cell)
{ {

1
OpenRA.Mods.Common/Traits/World/TerrainTunnelLayer.cs
View File

@@ -71,6 +71,7 @@ namespace OpenRA.Mods.Common.Traits
bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return enabled; } bool ICustomMovementLayer.EnabledForActor(ActorInfo a, LocomotorInfo li) { return enabled; }
byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.Tunnel; } } byte ICustomMovementLayer.Index { get { return CustomMovementLayerType.Tunnel; } }
bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return false; } } bool ICustomMovementLayer.InteractsWithDefaultLayer { get { return false; } }
bool ICustomMovementLayer.ReturnToGroundLayerOnIdle { get { return true; } }
WPos ICustomMovementLayer.CenterOfCell(CPos cell) WPos ICustomMovementLayer.CenterOfCell(CPos cell)
{ {

1
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -367,6 +367,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
byte Index { get; } byte Index { get; }
bool InteractsWithDefaultLayer { get; } bool InteractsWithDefaultLayer { get; }
bool ReturnToGroundLayerOnIdle { get; }
bool EnabledForActor(ActorInfo a, LocomotorInfo li); bool EnabledForActor(ActorInfo a, LocomotorInfo li);
int EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell); int EntryMovementCost(ActorInfo a, LocomotorInfo li, CPos cell);