Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better Current Location / Travel Status #5022

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Better Current Location / Travel Status #5022

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6c8039
Clarify Current Location travel text
WeaverThree Oct 10, 2024
f443c36
Current Location - add null check for safety
WeaverThree Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 43 additions & 14 deletions MekHQ/src/mekhq/campaign/CurrentLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,26 +138,55 @@ private boolean pickJumpPoint(LocalDate now) {
public String getReport(LocalDate date) {
StringBuilder sb = new StringBuilder();
sb.append("<html><b>Current Location</b><br>")
.append(currentSystem.getPrintableName(date)).append("<br>");
if ((null != jumpPath) && !jumpPath.isEmpty()) {
sb.append("In transit to ").append(jumpPath.getLastSystem().getPrintableName(date)).append(" ");
}

// First Line
.append("In ")
.append(currentSystem.getPrintableName(date))
.append(' ');

if (isOnPlanet()) {
sb.append("<i>on planet</i>");
sb.append("on planet ")
.append(getPlanet().getPrintableName(date));
} else if (isAtJumpPoint()) {
sb.append("<i>at jump point</i>");
sb.append("at jump point");
if (!Double.isInfinite(currentSystem.getRechargeTime(date))) {
sb.append(" (Jumpship ")
.append(String.format(Locale.ROOT, "%.0f",
(100.0 * rechargeTime) / currentSystem.getRechargeTime(date)))
.append("% charged)");
}
} else {
sb.append("<i>").append(String.format(Locale.ROOT, "%.2f", getTransitTime()))
.append(" days out </i>");
if((null != jumpPath) && (currentSystem == jumpPath.getLastSystem())) {
sb.append(String.format(Locale.ROOT, "%.2f", getTransitTime()))
.append(" days from planet");
} else {
double timeToJP = currentSystem.getTimeToJumpPoint(1.0) - getTransitTime();
sb.append(String.format(Locale.ROOT, "%.2f", timeToJP))
.append(" days from jump point");
}

}
if (!Double.isInfinite(currentSystem.getRechargeTime(date))) {
sb.append(", <i>")
.append(String.format(Locale.ROOT, "%.0f",
(100.0 * rechargeTime) / currentSystem.getRechargeTime(date)))
.append("% charged </i>");

sb.append("<br/>");

// Second Line

if ((null != jumpPath) && !jumpPath.isEmpty()) {
sb.append("Traveling to ")
.append(jumpPath.getLastSystem().getPrintableName(date))
.append(": ");
if(jumpPath.getJumps() > 0) {
sb.append(jumpPath.getJumps())
.append(jumpPath.getJumps() == 1 ? " jump remaining" : " jumps remaining");
} else {
sb.append("In destination system");
}
} else {
sb.append("Not traveling");
}
return sb.append("</html>").toString();

sb.append("</html>");
return sb.toString();
}

public JumpPath getJumpPath() {
Expand Down