Improve and integrate the design and controls in the System Map and the Sector Map

data/lang/core/en.json

@@ -1083,6 +1083,10 @@
  "description": "",
  "message": "\" Oxygen atmosphere\""
  },
+ "OBJECT_INFO": {
+ "description": "Originally for use as a window title and a button tooltip in the system map",
+ "message": "Object info"
+ },
  "OCEANICWORLD": {
  "description": "",
  "message": "\" oceanic world\""

data/lang/input-core/en.json

@@ -71,6 +71,26 @@
  "description": "Descriptive name for the Freelook Yaw axis.",
  "message": "Freelook Yaw"
  },
+ "BIND_MAP_VIEW_PITCH": {
+ "description": "Axis binding",
+ "message": "Map Pitch"
+ },
+ "BIND_MAP_VIEW_SHIFT_HORIZONTALLY": {
+ "description": "Axis binding",
+ "message": "Shift Map Horizontally"
+ },
+ "BIND_MAP_VIEW_SHIFT_LONGITUDINALLY": {
+ "description": "Axis binding",
+ "message": "Shift Map Longitudinally"
+ },
+ "BIND_MAP_VIEW_SHIFT_VERTICALLY": {
+ "description": "Axis binding",
+ "message": "Shift Map Vertically"
+ },
+ "BIND_MAP_VIEW_YAW": {
+ "description": "Axis binding",
+ "message": "Map Yaw"
+ },
  "BIND_PRIMARY_FIRE": {
  "description": "Descriptive name for the PrimaryFire action.",
  "message": "Primary Fire"
@@ -134,6 +154,10 @@
  "GROUP_MISCELLANEOUS": {
  "message": "Miscellaneous"
  },
+ "GROUP_SECTOR_MAP_VIEW_CONTROLS": {
+ "description": "Header for the SectorMapViewControls input group.",
+ "message": "Sector Map View Controls"
+ },
  "GROUP_SHIP_ORIENT": {
  "description": "Header for the ShipOrient input group.",
  "message": "Ship Orientation"
@@ -150,6 +174,10 @@
  "description": "Header for the General input page.",
  "message": "General Controls"
  },
+ "PAGE_MAP_CONTROLS": {
+ "description": "Header for the MapControls input page.",
+ "message": "Map Controls"
+ },
  "PAGE_SHIP_CONTROLS": {
  "description": "Header for the ShipControls input page.",
  "message": "Ship - Controls"

data/libs/ui/NavButton.lua

@@ -26,7 +26,7 @@ function NavButton.New (text, target)
  Game.player:SetNavTarget(Space.GetBody(self.target.bodyIndex))
  end
  elseif not Game.InHyperspace() then
- Game.player:SetHyperspaceTarget(self.target:GetStarSystem().path)
+ Game.sectorView:SwitchToPath(self.target:GetStarSystem().path)
  -- XXX we should do something useful here
  -- e.g. switch to the sector map or just beep
  end

data/pigui/libs/chat-form.lua

@@ -169,7 +169,7 @@ function ChatForm:AddNavButton (target)
  Game.player:SetNavTarget(Space.GetBody(target.bodyIndex))
  end
  elseif not Game.InHyperspace() then
- Game.player:SetHyperspaceTarget(target:GetStarSystem().path)
+ Game.sectorView:SwitchToPath(target:GetStarSystem().path)
  ui.playBoinkNoise()
  end
  end