Merge pull request #6333 from sam52796/Hyperdrive_UI_and_sound

Hyperdrive UI and sound

Author: sturnclaw

data/lang/core/en.json

@@ -601,11 +601,11 @@
   },
   "HYPERSPACE_ARRIVAL_CLOUD": {
     "description": "",
-    "message": "Hyperspace arrival cloud"
+    "message": "Arrival"
   },
   "HYPERSPACE_ARRIVAL_CLOUD_REMNANT": {
     "description": "",
-    "message": "Hyperspace arrival cloud remnant"
+    "message": "Arrival (Remnant)"
   },
   "HYPERSPACE_CLOUDS_DISPLAY_MODE": {
     "description": "Label for hyperspace cloud display modes.",
@@ -629,7 +629,7 @@
   },
   "HYPERSPACE_DEPARTURE_CLOUD": {
     "description": "",
-    "message": "Hyperspace departure cloud"
+    "message": "Departure"
   },
   "HYPERSPACE_JUMP_ABORT": {
     "description": "Mouse over text for hyperdrive button on ship control panel",

data/pigui/views/map-sector-view.lua

@@ -830,12 +830,29 @@ local function drawEdgeButtons()
 
 end
 
+local function hasActiveExclusiveLeftModule()
+	for _, module in ipairs(leftSidebar.modules) do
+		if module.exclusive and module.active and not module.closing then
+			return true
+		end
+	end
+	return false
+end
+
 ui.registerModule("game", { id = 'map-sector-view', draw = function()
 	player = Game.player
 	if Game.CurrentView() == "SectorView" then
 
 		if shouldRefresh then
 			shouldRefresh = false
+
+			-- Always show system info when entering SectorView, if we can. This helps the player find the hyperspace routing.
+			if not hasActiveExclusiveLeftModule() and not infoView.active then
+				infoView.active = true
+				infoView.closing = false
+				infoView.alpha = nil
+			end
+
 			leftSidebar:Refresh()
 			rightSidebar:Refresh()
 			hyperJumpPlanner.updateRouteList()

src/Game.cpp

@@ -929,10 +929,12 @@ void Game::EmitPauseState(bool paused)
 		// Notify UI that time is paused.
 		LuaEvent::Queue("onGamePaused");
 		LuaEvent::Queue(PiGui::GetEventQueue(), "onGamePaused");
+		Sound::Pause(1);
 	} else {
 		// Notify the UI that time is running again.
 		LuaEvent::Queue("onGameResumed");
 		LuaEvent::Queue(PiGui::GetEventQueue(), "onGameResumed");
+		Sound::Pause(0);
 	}
 	LuaEvent::Emit();
 }