Merge branch 'jibauni' into Jibauni

Author: TheGiraffe3

copyright

@@ -3777,9 +3777,23 @@ Comment:
 
 Files:
  images/ui/red?alert*
+ images/ui/tactical/acceleration*
+ images/ui/tactical/gun?range*
+ images/ui/tactical/turret?range*
+ images/ui/tactical/turn*
+ images/ui/tactical/velocity*
 Copyright: Zitchas (zitchas.jma@gmail.com)
 License: CC-BY-SA-4.0
 
+Files:
+ images/ui/tactical/crew*
+ images/ui/tactical/energy*
+ images/ui/tactical/fuel*
+ images/ui/tactical/thermal*
+Copyright: Zitchas
+License: CC-BY-SA-4.0
+Comment: Derived from works by Michael Zahniser (under the same license).
+
 Files:
  images/_menu/haze-brown*
 Copyright: RisingLeaf (https://github.com/RisingLeaf)

data/_ui/interfaces.txt

@@ -119,7 +119,9 @@ color "overlay neutral shields" .43 .55 .70 .75
 color "overlay neutral hull" .45 .5 0. .25
 color "overlay neutral disabled" .5 0. 0. .25
 color "overlay outfit scan" .5 .5 .5 .25
+color "overlay outfit scan out of range" .25 .25 .25 .25
 color "overlay cargo scan" .7 .7 .7 .25
+color "overlay cargo scan out of range" .35 .35 .35 .25
 
 # Colors used when "missile overlays" are enabled
 color "missile enemy" 1. 1. .25 .7
@@ -724,32 +726,6 @@ interface "hud"
 		dimensions 110 110
 		color "disabled hull"
 		size 1.5
-	
-	visible if "range display"
-	sprite "ui/range"
-		from 130 263
-		align top left
-	string "target range"
-		from 160 260
-		align top left
-	visible if "tactical display"
-	sprite "ui/tactical"
-		from 130 290
-		align top left
-	string "target crew"
-		from 162 298
-		align top left
-	string "target fuel"
-		from 162 318
-		align top left
-	string "target energy"
-		from 157 338
-		align top left
-	string "target heat"
-		from 147 358
-		align top left
-	visible
-	
 	string "target name"
 		center 75 395
 		color "bright"
@@ -771,6 +747,109 @@ interface "hud"
 		center 75 455
 		color "medium"
 
+	visible if "range display"
+	sprite "ui/tactical/range"
+		from 130 263
+		align top left
+	string "target range"
+		from 160 260
+		align top left
+
+	visible if "strategic range display"
+	sprite "ui/tactical/range"
+		from 2 255
+		align top left
+	string "target range"
+		from 2 240
+		align top left
+
+	visible if "target crew display"
+	sprite "ui/tactical/crew"
+		from 148 286
+		align top left
+	string "target crew"
+		from 162 286
+		align top left
+	
+	visible if "mobility crew display"
+	sprite "ui/tactical/crew"
+		from 13 354
+		align top left
+	string "target crew"
+		from 17 372
+		align top center
+
+	visible if "target fuel display"
+	sprite "ui/tactical/fuel"
+		from 146 308
+		align top left
+	string "target fuel"
+		from 162 306
+		align top left
+
+	visible if "target energy display"
+	sprite "ui/tactical/energy"
+		from 144 324
+		align top left
+	string "target energy"
+		from 157 325
+		align top left
+
+	visible if "target thermal display"
+	sprite "ui/tactical/thermal"
+		from 136 343
+		align top left
+	string "target heat"
+		from 147 346
+		align top left
+
+	visible if "target weapon range display"
+	sprite "ui/tactical/gun range"
+		from 154 252
+		align top center
+	sprite "ui/tactical/turret range"
+		from 190 252
+		align top center
+	string "target gun"
+		from 152 268
+		align top center
+	string "target turret"
+		from 190 268
+		align top center
+
+	visible if "turn while combined"
+	sprite "ui/tactical/turn"
+		from 118 370
+		align top left
+	string "target turnrate"
+		from 139 370
+		align top left
+
+	visible if "turn while not combined"
+	sprite "ui/tactical/turn"
+		from 145 288
+		align top left
+	string "target turnrate"
+		from 162 286
+		align top left
+
+	visible if "target velocity display"
+	sprite "ui/tactical/velocity"
+		from 142 288
+		align top left
+	string "target velocity"
+		from 158 286
+		align top left
+
+	visible if "target acceleration display"
+	sprite "ui/tactical/acceleration"
+		from 194 286
+		align top left
+	string "target acceleration"
+		from 208 286
+		align top left
+	
+	
 	# Other HUD elements:
 	box "escorts"
 		from 0 460 top left

data/_ui/tooltips.txt

@@ -693,8 +693,42 @@ tip "solar collection:"
 tip "solar heat:"
 	`Heat produced depending on how far this ship is from the star at the center of the system.`
 
+tip "strategic scan power:"
+	`Strategic scanners allow you to view your current target's distance from you, maximum gun range, maximum turret range, current speed, maximum acceleration, and turning speed when it is within range. The range is proportional to the square root of this value.`
+
 tip "tactical scan power:"
-	`Allows viewing your current target's crew complement, fuel, heat, and energy levels when it is within range. The range is proportional to the square root of this value.`
+	`Tactical scanners allow you to view your current target's crew complement, fuel, heat, and energy levels when it is within range. The range is proportional to the square root of this value.`
+
+tip "acceleration scan power:"
+	`Mobility scanners allow you to view your current target's current maximum acceleration when it is within range. The range is proportional to the square root of this value.`
+
+tip "crew scan power:"
+	`Crew scanners allow you to view your current target's crew complement when it is within range. The range is proportional to the square root of this value.`
+
+tip "energy scan power:"
+	`Energy scanners allow you to view your current target's energy levels when it is within range. The range is proportional to the square root of this value.`
+
+tip "fuel scan power:"
+	`Fuel scanners allow you to view your current target's fuel levels when it is within range. The range is proportional to the square root of this value.`
+
+tip "maneuver scan power:"
+	`Maneuver scanners allow you to view your current target's current maximum turn speed when it is within range. The range is proportional to the square root of this value.`
+
+tip "mobility scan power:"
+	`Mobility scanners allow you to view your current target's current speed and maximum acceleration when it is within range. The range is proportional to the square root of this value.`
+
+tip "range finder power:"
+	`Range finders allow you to view the distance from the center of your ship to the center of your current target. There is no range limit.`
+
+tip "thermal scan power:"
+	`Thermal scanners allow you to view your current target's thermal level when it is within range. The range is proportional to the square root of this value.`
+
+tip "velocity scan power:"
+	`Mobility scanners allow you to view your current target's current speed when it is within range. The range is proportional to the square root of this value.`
+
+tip "weapon scan power:"
+	`Weapon scanners allow you to view your current target's weapons' maximum range when it is within scanner range. Specifically, it shows the longest range of all weapons in a gun hardpoint; and the longest range of all weapons in a turret hardpoint. These ranges include the weapon offset and thus show the maximum range from the center of the ship its shots can reach. The scanner range is proportional to the square root of this value.`
+
 
 tip "thrust:"
 	`Thrust produced by engines. Higher thrust increases a ship's acceleration and top speed. The more mass a ship has, the more thrust is needed to achieve the same acceleration.`

data/korath/korath missions.txt

@@ -439,7 +439,7 @@ mission "Efreti: Distress Call 5"
 	destination "Greenwater"
 	landing
 	passengers 66
-	blocked `You need <bunks> available to carry the salvage team.`
+	blocked `You need <bunks> available bunks to carry the salvage team.`
 
 	to offer
 		has "Efreti: Distress Call 4: done"