Feat(code): Add HUD display for Solar Power and Solar Wind

data/_ui/interfaces.txt

@@ -777,10 +777,8 @@ interface "hud"
 		from -70 320
 		color "medium"
 		align right
-
-
-
-	# Targets.
+
+	# Radar
 	anchor top left
 	visible if "red alert"
 	sprite "ui/red alert"
@@ -796,7 +794,6 @@ interface "hud"
 	value "radar radius" 110
 	value "radar pointer radius" 130
 
-	# Current system.
 	sprite "ui/current system"
 		from 43 0
 		align top left
@@ -811,7 +808,6 @@ interface "hud"
 	sprite "ui/navigation"
 		from 195 0
 		align top left
-
 	string "navigation mode"
 		from 215 20
 		align left
@@ -822,7 +818,27 @@ interface "hud"
 		color "medium"
 		width 130
 		truncate back
+
+	visible if "system solar display"
+	sprite "ui/tactical/solar"
+		from 252 67
+		align top left
+	string "system solar"
+		from 269 76
+		color "medium"
+		align left
+
+	visible if "system wind display"
+	sprite "ui/tactical/wind"
+		from 258 90
+		align top left
+	string "system wind"
+		from 275 99
+		color "medium"
+		align left
 
+	# Targets
+	visible
 	sprite "ui/target"
 		from 0 275
 		align top left

data/_ui/tooltips.txt

@@ -84,6 +84,12 @@ tip "asteroid scan power:"
 tip "atmosphere scan:"
 	`This type of scanning cannot be performed by your ship, but this outfit might be useful for certain missions.`
 
+tip "solar power sensor:"
+	`Automatically analyzes stellar objects to determine their precise solar power for display on the HUD, with combined output for multi-star systems.`
+
+tip "solar wind sensor:"
+	`Automatically analyzes stellar objects to determine their precise solar wind for display on the HUD, with combined output for multi-star systems.`
+
 tip "bunks:"
 	`The number of people (passengers or crew) your ship can hold.`
 

data/human/outfits.txt

@@ -290,6 +290,19 @@ outfit "Thermal Scanner"
 	"thermal scan power" 35
 	description "While thermal signatures have always been useful as a means of identifying and tracking ships, determining a ship's effective average thermal load was functionally useless until recently. With the development of the plasma cannon and then the flamethrower, attempting to overheat a ship has become a viable combat technique. As such, engineers with the Free World have begun assembling these sensor packages to support the daring captains who choose to use this tactic."
 
+
+outfit "Astronomical Scanner"
+	category "Systems"
+	cost 18000
+	thumbnail "outfit/astronomical scanner"
+	"mass" 2
+	"outfit space" -2
+	"energy consumption" .1
+	"solar power sensor" 1
+	"solar wind sensor" 1
+	description "An astronomical scanner provides data on the system's total solar power and wind output, allowing captains to see which systems are best for solar collection or ramscoop usage."
+
+
 outfit "Surveillance Pod"
 	category "Systems"
 	cost 122500

data/human/sales.txt

@@ -307,7 +307,8 @@ outfitter "Deep Sky Basics"
 	"A370 Atomic Thruster"
 	"A375 Atomic Steering"
 	"AR120 Reverse Thruster"
-
+	"Astronomical Scanner"
+
 outfitter "Deep Sky Advanced"
 	"Ramscoop"
 	"LP144a Battery Pack"
@@ -349,6 +350,7 @@ outfitter "Deep Sky Advanced"
 	"In-flight Mass Display"
 	"Hyperjump Fuel Display"
 	"Fuel Bar Hyperjump Display"
+	"Astronomical Scanner"
 
 outfitter "Lovelace Basics"
 	"Anti-Missile Turret"

source/Engine.cpp

@@ -795,6 +795,20 @@ void Engine::Step(bool isActive)
 			info.SetCondition("flagship solar display");
 			info.SetString("flagship solar", to_string(flagshipSolar));
 		}
+		// Display combined Solar Power for system
+		int displaySystemPower = (flagship->DisplaySystemSolar() * 100); // Multiplied to better display decimal inputs
+		if(displaySystemPower >= 0.01 && flagship->Attributes().Get("solar power sensor"))
+		{
+			info.SetCondition("system solar display");
+			info.SetString("system solar", to_string(displaySystemPower));
+		}
+		// Display combined Solar Wind for system
+		int displaySystemWind = (flagship->DisplaySystemWind() * 100); // Multiplied to better display decimal inputs
+		if(displaySystemWind >= 0.01 && flagship->Attributes().Get("solar wind sensor"))
+		{
+			info.SetCondition("system wind display");
+			info.SetString("system wind", to_string(displaySystemWind));
+		}
 		// These check for the attribute to determine if the pilot has installed
 		// outfits that give a live display of ship mass and jump fuel costs.
 		bool flagshipMassDisplay = flagship->DisplayMass();

source/Ship.cpp

@@ -2911,6 +2911,22 @@ double Ship::DisplayRamScoop() const
 
 
 
+// Display combined solar power for the system.
+double Ship::DisplaySystemSolar() const
+{
+	return currentSystem->SolarPower();
+}
+
+
+
+// Display combined solar wind for the system.
+double Ship::DisplaySystemWind() const
+{
+	return currentSystem->SolarWind();
+}
+
+
+
 // These are for the thruster activity bars
 double Ship::DisplayThrust() const
 {

source/Ship.h

@@ -347,6 +347,8 @@ class Ship : public Body, public std::enable_shared_from_this<Ship> {
 	bool DisplayJumpFuelCost() const;
 	double DisplaySolar() const;
 	double DisplayRamScoop() const;
+	double DisplaySystemSolar() const;
+	double DisplaySystemWind() const;
 	// These are for the thruster activity bars
 	double DisplayThrust() const;
 	double DisplayTurn() const;