tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shuttle console angular velocity (#34748)

Browse Source
This commit is contained in:
slarticodefast
2025-01-30 00:24:46 +01:00
committed by GitHub
parent 9319e09984
commit e938512713
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/Shuttles/UI/NavScreen.xaml.cs
View File

@@ -81,13 +81,19 @@ public sealed partial class NavScreen : BoxContainer
// Get the positive reduced angle. // Get the positive reduced angle.
var displayRot = -worldRot.Reduced(); var displayRot = -worldRot.Reduced();
GridPosition.Text = $"{worldPos.X:0.0}, {worldPos.Y:0.0}"; GridPosition.Text = Loc.GetString("shuttle-console-position-value",
GridOrientation.Text = $"{displayRot.Degrees:0.0}"; ("X", $"{worldPos.X:0.0}"),
("Y", $"{worldPos.Y:0.0}"));
GridOrientation.Text = Loc.GetString("shuttle-console-orientation-value",
("angle", $"{displayRot.Degrees:0.0}"));
var gridVelocity = gridBody.LinearVelocity; var gridVelocity = gridBody.LinearVelocity;
gridVelocity = displayRot.RotateVec(gridVelocity); gridVelocity = displayRot.RotateVec(gridVelocity);
// Get linear velocity relative to the console entity // Get linear velocity relative to the console entity
GridLinearVelocity.Text = $"{gridVelocity.X + 10f * float.Epsilon:0.0}, {gridVelocity.Y + 10f * float.Epsilon:0.0}"; GridLinearVelocity.Text = Loc.GetString("shuttle-console-linear-velocity-value",
GridAngularVelocity.Text = $"{-gridBody.AngularVelocity + 10f * float.Epsilon:0.0}"; ("X", $"{gridVelocity.X + 10f * float.Epsilon:0.0}"),
("Y", $"{gridVelocity.Y + 10f * float.Epsilon:0.0}"));
GridAngularVelocity.Text = Loc.GetString("shuttle-console-angular-velocity-value",
("angularVelocity", $"{-MathHelper.RadiansToDegrees(gridBody.AngularVelocity) + 10f * float.Epsilon:0.0}"));
} }
} }

4
Resources/Locale/en-US/shuttles/console.ftl
View File

@@ -10,9 +10,13 @@ shuttle-console-prevent = You are unable to pilot this ship
shuttle-console-display-label = Display shuttle-console-display-label = Display
shuttle-console-position = Position: shuttle-console-position = Position:
shuttle-console-position-value = {$X}, {$Y}
shuttle-console-orientation = Orientation: shuttle-console-orientation = Orientation:
shuttle-console-orientation-value = {$angle}
shuttle-console-linear-velocity = Linear velocity: shuttle-console-linear-velocity = Linear velocity:
shuttle-console-linear-velocity-value = {$X}, {$Y}
shuttle-console-angular-velocity = Angular velocity: shuttle-console-angular-velocity = Angular velocity:
shuttle-console-angular-velocity-value = {$angularVelocity}
shuttle-console-unknown = Unknown shuttle-console-unknown = Unknown
shuttle-console-iff-label = {$name} ({$distance}m) shuttle-console-iff-label = {$name} ({$distance}m)