- Fixed carrier scheduled to depart message. Now it will say carrier will depart in H hours M minutes.

- Consolidated action map, to reduce the options even farther based on isOnFoot, isInMainShip, and isInSRV.

Author: stone-alex

app/src/main/java/elite/intel/ai/brain/AiActionsMap.java

@@ -6,6 +6,6 @@ public class ClosePanelHandler implements CommandHandler {
 
     @Override
     public void handle(String action, JsonObject params, String responseText) {
-        UiExit.close();
+        UiNavCommon.close();
     }
 }

app/src/main/java/elite/intel/ai/brain/handlers/commands/ClosePanelHandler.java

@@ -133,6 +133,7 @@ public enum Commands {
     SHOW_STORAGE_PANEL                                  ("show_storage_panel", null, OpenStoragePanelHandler.class),
     SHOW_STATUS_PANEL                                   ("show_status_panel", null, OpenStatusPanelHandler.class),
     SHOW_STATION_SERVICES                               ("show_station_services_panel", null, OpenStationServicesHandler.class),
+    LAUNCH_SHIP                                         ("launch_ship", null, LaunchShipHandler.class),
     EXIT_CLOSE                                          ("exit_close", null, ClosePanelHandler.class),
 
 

app/src/main/java/elite/intel/ai/brain/handlers/commands/Commands.java

@@ -15,7 +15,7 @@ public class DisembarkHandler implements CommandHandler {
 
     @Override
     public void handle(String action, JsonObject params, String responseText) {
-        UiExit.close();
+        UiNavCommon.close();
         if (status.isInSrv()) {
             GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_FOCUS_ROLE_PANEL.getGameBinding(), 0));
 

app/src/main/java/elite/intel/ai/brain/handlers/commands/DisembarkHandler.java

@@ -0,0 +1,15 @@
+package elite.intel.ai.brain.handlers.commands;
+
+import com.google.gson.JsonObject;
+import elite.intel.ai.hands.events.GameInputEvent;
+import elite.intel.gameapi.GameControllerBus;
+
+public class LaunchShipHandler implements CommandHandler {
+    @Override
+    public void handle(String action, JsonObject params, String responseText) {
+        UiNavCommon.close();
+        UiNavCommon.prepToKnownUiPositionWhileInTheShipAtStation();
+        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_UP.getGameBinding(), 0));
+        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_ACTIVATE.getGameBinding(), 0));
+    }
+}

app/src/main/java/elite/intel/ai/brain/handlers/commands/LaunchShipHandler.java

@@ -14,6 +14,7 @@ public class OpenFleetCarrierManagementHandler implements CommandHandler {
 
     /// not a sure fire. assumes default UI selection. will fail often.
     @Override public void handle(String action, JsonObject params, String responseText) {
+        UiNavCommon.close();
         if(status.isOnFoot()){
             GameControllerBus.publish(new GameInputEvent(BINDING_ON_FOOT_WHEEL.getGameBinding(), 500));
             GameControllerBus.publish(new GameInputEvent(BINDING_UI_RIGHT.getGameBinding(), 0));

app/src/main/java/elite/intel/ai/brain/handlers/commands/OpenFleetCarrierManagementHandler.java

@@ -8,18 +8,10 @@ public class OpenStationServicesHandler implements CommandHandler {
 
     @Override
     public void handle(String action, JsonObject params, String responseText) {
-        UiExit.close();
-
-        prepToKnownUiPosition();
+        UiNavCommon.close();
+        UiNavCommon.prepToKnownUiPositionWhileInTheShipAtStation();
         GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_UP.getGameBinding(), 0));
         GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_UP.getGameBinding(), 0));
         GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_ACTIVATE.getGameBinding(), 0));
     }
-
-
-    private void prepToKnownUiPosition() {
-        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_DOWN.getGameBinding(), 0));
-        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_DOWN.getGameBinding(), 0));
-        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_DOWN.getGameBinding(), 0));
-    }
 }

app/src/main/java/elite/intel/ai/brain/handlers/commands/OpenStationServicesHandler.java

@@ -5,7 +5,7 @@
 import elite.intel.session.Status;
 import elite.intel.session.ui.UINavigator;
 
-public class UiExit {
+public class UiNavCommon {
 
     public static void close() {
         Status status = Status.getInstance();
@@ -15,4 +15,11 @@ public static void close() {
         }
         new UINavigator().closeOpenPanel();
     }
+
+
+    public static void prepToKnownUiPositionWhileInTheShipAtStation() {
+        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_DOWN.getGameBinding(), 0));
+        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_DOWN.getGameBinding(), 0));
+        GameControllerBus.publish(new GameInputEvent(Bindings.GameCommand.BINDING_UI_DOWN.getGameBinding(), 0));
+    }
 }

…l/ai/brain/handlers/commands/UiExit.java …brain/handlers/commands/UiNavCommon.javaapp/src/main/java/elite/intel/ai/brain/handlers/commands/UiExit.java renamed to app/src/main/java/elite/intel/ai/brain/handlers/commands/UiNavCommon.java app/src/main/java/elite/intel/ai/brain/handlers/commands/UiExit.java renamed to app/src/main/java/elite/intel/ai/brain/handlers/commands/UiNavCommon.java

@@ -6,8 +6,8 @@
 import elite.intel.gameapi.SensorDataEvent;
 import elite.intel.gameapi.journal.events.CarrierJumpRequestEvent;
 import elite.intel.session.PlayerSession;
-import elite.intel.util.TimestampFormatter;
 
+import java.time.Duration;
 import java.time.Instant;
 
 @SuppressWarnings("unused")
@@ -16,19 +16,29 @@ public class CarrierJumpRequestSubscriber {
     @Subscribe
     public void onCarrierJumpRequestEvent(CarrierJumpRequestEvent event) {
         Thread.ofVirtual().start(() -> {
-            String fleetCarrierType = event.getCarrierType(); //nulls
-            String destinationSystemName = event.getSystemName(); //nulls
             String destinationStellarBody = event.getBody();
             String rawDepartureTime = event.getDepartureTime();
-            String formattedDepartureTime = TimestampFormatter.formatTimestamp(rawDepartureTime, true);
+
+            Instant departureInstant = Instant.parse(rawDepartureTime);
+            long totalMinutes = Duration.between(Instant.now(), departureInstant).toMinutes();
+            long hours = totalMinutes / 60;
+            long minutes = totalMinutes % 60;
+
+            String timeUntil;
+            if (hours > 0 && minutes > 0) {
+                timeUntil = hours + (hours == 1 ? " hour" : " hours") + " and " + minutes + (minutes == 1 ? " minute" : " minutes");
+            } else if (hours > 0) {
+                timeUntil = hours + (hours == 1 ? " hour" : " hours");
+            } else {
+                timeUntil = minutes + (minutes == 1 ? " minute" : " minutes");
+            }
 
             StringBuilder sb = new StringBuilder();
-            sb.append("Carrier Jump Scheduled: ");
-            sb.append(" to ");
-            sb.append(destinationStellarBody);
-            sb.append(" departure time: ");
-            sb.append(formattedDepartureTime);
-            sb.append(".");
+            sb.append("Carrier scheduled to depart");
+            if (destinationStellarBody != null && !destinationStellarBody.isBlank()) {
+                sb.append(" to ").append(destinationStellarBody);
+            }
+            sb.append(" in ").append(timeUntil).append(".");
 
             PlayerSession playerSession = PlayerSession.getInstance();
             playerSession.setCarrierDepartureTime(rawDepartureTime);

app/src/main/java/elite/intel/gameapi/journal/subscribers/CarrierJumpRequestSubscriber.java

@@ -23,7 +23,7 @@ public static String formatTimestamp(String isoTimestamp, boolean useLocalTime)
         try {
             ZonedDateTime zdt = ZonedDateTime.parse(isoTimestamp, DateTimeFormatter.ISO_DATE_TIME);
             if (useLocalTime) {
-                zdt = zdt.withZoneSameInstant(ZoneId.of("America/Los_Angeles")); // PDT
+                zdt = zdt.withZoneSameInstant(ZoneId.systemDefault());
             }
             return zdt.format(HUMAN_READABLE_FORMATTER);
         } catch (Exception e) {