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

Fix movement on ramps when moving to subcell

Browse Source 
Fix movement on ramps when moving to subcell
This commit is contained in:
Moritz Heller
2024-07-18 13:24:17 +02:00
committed by Gustas
parent bdc142ae51
commit 81bcff0f8a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -451,7 +451,13 @@ namespace OpenRA.Mods.Common.Activities
if (progress >= Distance) if (progress >= Distance)
{ {
mobile.SetCenterPosition(self, To); var toPos = To;
// apply ramp offset to ground units
if (MovingOnGroundLayer)
toPos -= new WVec(WDist.Zero, WDist.Zero, self.World.Map.DistanceAboveTerrain(toPos));
mobile.SetCenterPosition(self, toPos);
mobile.Facing = TurnsWhileMoving mobile.Facing = TurnsWhileMoving
? Util.TickFacing(mobile.Facing, ToFacing, mobile.TurnSpeed) ? Util.TickFacing(mobile.Facing, ToFacing, mobile.TurnSpeed)
: ToFacing; : ToFacing;

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

@@ -471,8 +471,10 @@ namespace OpenRA.Mods.Common.Traits
var position = cell.Layer == 0 ? self.World.Map.CenterOfCell(cell) : var position = cell.Layer == 0 ? self.World.Map.CenterOfCell(cell) :
self.World.GetCustomMovementLayers()[cell.Layer].CenterOfCell(cell); self.World.GetCustomMovementLayers()[cell.Layer].CenterOfCell(cell);
var subcellOffset = self.World.Map.Grid.OffsetOfSubCell(subCell); position += self.World.Map.Grid.OffsetOfSubCell(subCell);
SetCenterPosition(self, position + subcellOffset); position -= new WVec(0, 0, self.World.Map.DistanceAboveTerrain(position).Length);
SetCenterPosition(self, position);
FinishedMoving(self); FinishedMoving(self);
} }