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

Fix backwards movement not working correctly when turning in an arc

Browse Source
This commit is contained in:
Gustas
2022-11-08 15:10:04 +02:00
committed by Matthias Mailänder
parent a261abbc3f
commit a4e80e1153
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ namespace OpenRA.Mods.Common.Activities
readonly Func<BlockedByActor, List<CPos>> getPath; readonly Func<BlockedByActor, List<CPos>> getPath;
readonly Actor ignoreActor; readonly Actor ignoreActor;
readonly Color? targetLineColor; readonly Color? targetLineColor;
WAngle actorFacingModifier;
static readonly BlockedByActor[] PathSearchOrder = static readonly BlockedByActor[] PathSearchOrder =
{ {
@@ -160,7 +161,12 @@ namespace OpenRA.Mods.Common.Activities
var firstFacing = self.World.Map.FacingBetween(mobile.FromCell, nextCell.Value.Cell, mobile.Facing); var firstFacing = self.World.Map.FacingBetween(mobile.FromCell, nextCell.Value.Cell, mobile.Facing);
if (mobile.Info.CanMoveBackward && self.World.WorldTick - startTicks < mobile.Info.BackwardDuration && Math.Abs(firstFacing.Angle - mobile.Facing.Angle) > 256) if (mobile.Info.CanMoveBackward && self.World.WorldTick - startTicks < mobile.Info.BackwardDuration && Math.Abs(firstFacing.Angle - mobile.Facing.Angle) > 256)
firstFacing = new WAngle(firstFacing.Angle + 512); {
actorFacingModifier = new WAngle(512);
firstFacing += actorFacingModifier;
}
else
actorFacingModifier = WAngle.Zero;
if (firstFacing != mobile.Facing) if (firstFacing != mobile.Facing)
{ {
@@ -513,7 +519,7 @@ namespace OpenRA.Mods.Common.Activities
Util.BetweenCells(self.World, mobile.FromCell, mobile.ToCell) + (fromSubcellOffset + toSubcellOffset) / 2, Util.BetweenCells(self.World, mobile.FromCell, mobile.ToCell) + (fromSubcellOffset + toSubcellOffset) / 2,
Util.BetweenCells(self.World, mobile.ToCell, nextCell.Value.Cell) + (toSubcellOffset + nextSubcellOffset) / 2, Util.BetweenCells(self.World, mobile.ToCell, nextCell.Value.Cell) + (toSubcellOffset + nextSubcellOffset) / 2,
mobile.Facing, mobile.Facing,
map.FacingBetween(mobile.ToCell, nextCell.Value.Cell, mobile.Facing), map.FacingBetween(mobile.ToCell, nextCell.Value.Cell, mobile.Facing) + Move.actorFacingModifier,
ToTerrainOrientation, ToTerrainOrientation,
nextToTerrainOrientation, nextToTerrainOrientation,
margin, margin,