From bca70cb2356ecee3f2597eef33ba172e74866dc9 Mon Sep 17 00:00:00 2001
From: MadisonianX <madisonianx@gmail.com>
Date: Mon, 2 Dec 2024 07:57:27 -0600
Subject: [PATCH 01/17] Feat(code): Add HUD display for Solar Power and Solar
 Wind

Adds an attribute for `"solar scan"` and `"ramscoop scan"` to determine the total solar power or solar wind of a system and display it on the HUD.
---
 data/_ui/interfaces.txt                |  19 +++++++++++++++++++
 data/human/outfits.txt                 |  13 +++++++++++++
 data/human/sales.txt                   |   3 ++-
 images/outfit/astronomical scanner.png | Bin 0 -> 21040 bytes
 images/ui/tactical/wind.png            | Bin 0 -> 1912 bytes
 source/Engine.cpp                      |  14 ++++++++++++++
 source/Ship.cpp                        |  16 ++++++++++++++++
 source/Ship.h                          |   2 ++
 8 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 images/outfit/astronomical scanner.png
 create mode 100644 images/ui/tactical/wind.png

diff --git a/data/_ui/interfaces.txt b/data/_ui/interfaces.txt
index da9e58f3e768..ad0f0868f127 100644
--- a/data/_ui/interfaces.txt
+++ b/data/_ui/interfaces.txt
@@ -769,6 +769,25 @@ interface "hud"
 		color "medium"
 		align left
 
+	# System Solar Power and Solar Wind display
+	visible if "system solar display"
+	sprite "ui/tactical/solar"
+		from -2205 70
+		align top left
+	string "system solar"
+		from -2188 79
+		color "medium"
+		align left
+
+	visible if "system wind display"
+	sprite "ui/tactical/wind"
+		from -2200 90
+		align top left
+	string "system wind"
+		from -2183 99
+		color "medium"
+		align left
+			
 	string "incoming"
 		from -70 320
 		color "medium"
diff --git a/data/human/outfits.txt b/data/human/outfits.txt
index bf903f42bb03..5e153ff4459c 100644
--- a/data/human/outfits.txt
+++ b/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 scan" 1
+	"ramscoop scan" 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
diff --git a/data/human/sales.txt b/data/human/sales.txt
index 3c2d8676fc3c..6e5e35cac7bf 100644
--- a/data/human/sales.txt
+++ b/data/human/sales.txt
@@ -258,7 +258,8 @@ outfitter "Common Outfits"
 	"Pilot's License"
 	"Laser Rifle"
 	"Fuel Bar Fixed Display"
-
+	"Astronomical Scanner"
+	
 outfitter "Ammo North"
 	"Meteor Missile"
 	"Torpedo"
diff --git a/images/outfit/astronomical scanner.png b/images/outfit/astronomical scanner.png
new file mode 100644
index 0000000000000000000000000000000000000000..d84e7db30584cdff827294f280d13f46fc969a2a
GIT binary patch
literal 21040
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
SSv7qC0000<MNUMnLSTYiC==TN

literal 0
HcmV?d00001

diff --git a/images/ui/tactical/wind.png b/images/ui/tactical/wind.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a5e0462affffe28b6400a58898abb699aac8fe
GIT binary patch
literal 1912
zcmbVNeQeZZ81J${CLfzKXpj-C#el$i{kpr})g9Z|9ot0?*mh%s5W~Cny}NpMZP#|Y
z+k`}vC4e#m&PZY+BNzjyFp>oc6C?qFfJ0I6Bati{#4Y%T;G)Ke;M?2X1#sX(leTZ$
z-}5}b-}5~0(=98PS52QXYYK*8)BV-nT6BNHI`b!^>#7T#4e0imR=wK5u!2+8ne)z~
zf?^DtbV?33nvH>Ff~dxAKvJ8aEg9Dk8pBG<k{S@B(8QZySXMm5uYI2rxGZ^y21kGn
zXq7M`SGVi1u6=n>Y>$d=i6~o)mnH?|AP!A{C*v{25Rx7u<ySy!>orB-DTo>M5EWKH
zyfLs6uT*u2yKM|9(lmqfXk~Y@F1MTK`4XI^S&pKe6zd>aPH^x7W5?46fg<WsNT~HL
zO~*q|9wK6znm|#BM8cNfY^oln7`NL^(JaNXBtnozn__|_sTgxJ9=y;Hby+iIRlzNf
zph;~pJp^JqCL^w8-6}>pRVZmx5@-}-qb*q}pd@B-T8kb_1(!q$#$X&Orh%|b7OO>6
zQ#B&$16*f6-xC0(HxS6i7?(>to(*A`zE&h7ose<SMzBqTR4p{r7F~qCRz!2IrA8Af
zbqGvV52|V`Q>>L4$~fz=arpBAAj*m*V!>S|&<jlHAyD1yB+ZhHJ;<_xgA?p5Njn9a
z9)ku{Ne;E$2XzD)Uf>wPLEi&KjUxdQ{4ZD%g^;Sp0g^1oK^Rh+5+?9$B85sdrs^m#
zV#lRe1OkFzF-)L{(C_sSNVQFtC4u9hn{@&g$vBu0Y3H0g3B-^Ssi8%VcDgvm0W<bq
zRcx_po3WRWz0<{p7&mG*z==*|&oZRD$?hUKmggnFb0Y5uW$ahzGTL7t_Q-y$U1v3g
zP%Rs%Ty5z+Q3spTtC)<Z`al4p)!!aMv<eF)BK=w(Cj%2xFy=N9fyn7Y$~^`%)R36~
zI;;qzY)zn{s0YzEK<mTFPpo|7lK*c5J{tLSYQ+dp!VnEjim>ER)@T_k40V6aQs3?x
zLm4=lZPqe7SkXgvG(!cs*3sY{%D?>#hUKjBdn<yjZJ%7~fAL8$<IK&k);b1u%;<>i
zIdai={<+7e#rEY_6yG`1*IKl3^VH@&JM)S<@`$dY1%K)N?{&U0ymsd4Lr1m3Y25IQ
z(t*)eF1Safw)cP8bXizZk??&ybu_urC_ORnuy&<jM1J+Vn>pX^Jh}LI6Lxj`wGp*D
zy8d*5?a;R2kux)2npARfj`LjiMb~M5_RzC)z*FuEJ)4RzF<UwoeyvNNE#bP44IUig
zmk#}%U&hq6^#1<CPg{p;8{TT3RkiPG!`=;V&adx&J-NdF#qrJk$F}2z^&18Y{nL-+
zzPy^dZq{!d&N(n?<b~Fc%Bi{Mcb#27&~y7lpWc%{YlqO#yX^X^+>^VnJw5NnhkJ!Z
zx1yeJg73y@Z2sVibw$zSz?xv!K-c7+TVJm8?XRg^c%#EE?l1rI$EtmK2Xl{>wER}r
yT=U1S@6Uc<zx>bcpULB!&K)kl)7yEa>eG;`adz(8<u%s7(eGRCJ+NfmYySd-Ac;@_

literal 0
HcmV?d00001

diff --git a/source/Engine.cpp b/source/Engine.cpp
index aaf814210c0a..68724a7a7e72 100644
--- a/source/Engine.cpp
+++ b/source/Engine.cpp
@@ -790,6 +790,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); // Combined system Solar Power multiplied to not display decimal stats
+		if(displaySystemPower >= 0.01 && flagship->Attributes().Get("solar scan")) // Requires solar scan to display
+		{
+			info.SetCondition("system solar display");
+			info.SetString("system solar", to_string(displaySystemPower));
+		}
+		// Display combined Sold Wind for system
+		int displaySystemWind = (flagship->DisplaySystemWind() * 100); // Combined system Solar Wind multiplied to not display decimal stats
+		if(displaySystemWind >= 0.01 && flagship->Attributes().Get("ramscoop scan")) // Requires ramscoop scan to display
+		{
+			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();
diff --git a/source/Ship.cpp b/source/Ship.cpp
index 2db8a947ff9b..7758dc0f904d 100644
--- a/source/Ship.cpp
+++ b/source/Ship.cpp
@@ -2907,6 +2907,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
 {
diff --git a/source/Ship.h b/source/Ship.h
index 5426aad093ac..2c19d437f26b 100644
--- a/source/Ship.h
+++ b/source/Ship.h
@@ -345,6 +345,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;

From 1a7205fb58df61eabdff954a4ff2ea64fa027cc3 Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Mon, 2 Dec 2024 09:12:42 -0600
Subject: [PATCH 02/17] Update source/Engine.cpp

Co-authored-by: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com>
---
 source/Engine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Engine.cpp b/source/Engine.cpp
index 68724a7a7e72..c961061a86d6 100644
--- a/source/Engine.cpp
+++ b/source/Engine.cpp
@@ -797,7 +797,7 @@ void Engine::Step(bool isActive)
 			info.SetCondition("system solar display");
 			info.SetString("system solar", to_string(displaySystemPower));
 		}
-		// Display combined Sold Wind for system
+		// Display combined Solar Wind for system
 		int displaySystemWind = (flagship->DisplaySystemWind() * 100); // Combined system Solar Wind multiplied to not display decimal stats
 		if(displaySystemWind >= 0.01 && flagship->Attributes().Get("ramscoop scan")) // Requires ramscoop scan to display
 		{

From 058ea580972569faffb1224723ebfcd3be296efc Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Mon, 2 Dec 2024 09:12:59 -0600
Subject: [PATCH 03/17] Update data/human/outfits.txt

Co-authored-by: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com>
---
 data/human/outfits.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/human/outfits.txt b/data/human/outfits.txt
index 5e153ff4459c..9795f1da8659 100644
--- a/data/human/outfits.txt
+++ b/data/human/outfits.txt
@@ -300,7 +300,7 @@ outfit "Astronomical Scanner"
 	"energy consumption" .1
 	"solar scan" 1
 	"ramscoop scan" 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." 
+	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"

From 17268d1366f77afb477a67c0b4f17087a6f358c4 Mon Sep 17 00:00:00 2001
From: MadisonianX <madisonianx@gmail.com>
Date: Mon, 2 Dec 2024 09:46:54 -0600
Subject: [PATCH 04/17] Feat(code): Add HUD display for Solar Power and Solar
 Wind

---
 data/_ui/tooltips.txt | 6 ++++++
 data/human/sales.txt  | 1 +
 source/Engine.cpp     | 8 ++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/data/_ui/tooltips.txt b/data/_ui/tooltips.txt
index b73dfd6b7b1e..7fe6ccee7ebf 100644
--- a/data/_ui/tooltips.txt
+++ b/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 scan:"
+	`Allows scanning of stellar objects to determine their precise power output for display on the HUD.`
+
+tip "ramscoop scan:"
+	`Allows scanning of stellar objects to determine their precise wind output for display on the HUD.`
+
 tip "bunks:"
 	`The number of people (passengers or crew) your ship can hold.`
 
diff --git a/data/human/sales.txt b/data/human/sales.txt
index 6e5e35cac7bf..d59c5931067f 100644
--- a/data/human/sales.txt
+++ b/data/human/sales.txt
@@ -350,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"
diff --git a/source/Engine.cpp b/source/Engine.cpp
index c961061a86d6..935223585560 100644
--- a/source/Engine.cpp
+++ b/source/Engine.cpp
@@ -791,15 +791,15 @@ void Engine::Step(bool isActive)
 			info.SetString("flagship solar", to_string(flagshipSolar));
 		}
 		// Display combined Solar Power for system
-		int displaySystemPower = (flagship->DisplaySystemSolar() * 100); // Combined system Solar Power multiplied to not display decimal stats
-		if(displaySystemPower >= 0.01 && flagship->Attributes().Get("solar scan")) // Requires solar scan to display
+		int displaySystemPower = (flagship->DisplaySystemSolar() * 100); // Multiplied to better display decimal inputs
+		if(displaySystemPower >= 0.01 && flagship->Attributes().Get("solar scan"))
 		{
 			info.SetCondition("system solar display");
 			info.SetString("system solar", to_string(displaySystemPower));
 		}
 		// Display combined Solar Wind for system
-		int displaySystemWind = (flagship->DisplaySystemWind() * 100); // Combined system Solar Wind multiplied to not display decimal stats
-		if(displaySystemWind >= 0.01 && flagship->Attributes().Get("ramscoop scan")) // Requires ramscoop scan to display
+		int displaySystemWind = (flagship->DisplaySystemWind() * 100); // Multiplied to better display decimal inputs
+		if(displaySystemWind >= 0.01 && flagship->Attributes().Get("ramscoop scan"))
 		{
 			info.SetCondition("system wind display");
 			info.SetString("system wind", to_string(displaySystemWind));

From 11bb06fbc9a100bf7f6c5b71f386bc316e255230 Mon Sep 17 00:00:00 2001
From: MadisonianX <madisonianx@gmail.com>
Date: Mon, 2 Dec 2024 09:49:10 -0600
Subject: [PATCH 05/17] Update sales.txt

---
 data/human/sales.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/human/sales.txt b/data/human/sales.txt
index d59c5931067f..530170df7330 100644
--- a/data/human/sales.txt
+++ b/data/human/sales.txt
@@ -308,7 +308,8 @@ outfitter "Deep Sky Basics"
 	"A370 Atomic Thruster"
 	"A375 Atomic Steering"
 	"AR120 Reverse Thruster"
-
+	"Astronomical Scanner"
+	
 outfitter "Deep Sky Advanced"
 	"Ramscoop"
 	"LP144a Battery Pack"

From c82cfd7c7db1735fdaed8c56246a2ebb3b7455b3 Mon Sep 17 00:00:00 2001
From: MadisonianX <madisonianx@gmail.com>
Date: Tue, 3 Dec 2024 03:24:00 -0600
Subject: [PATCH 06/17] update interface data to child of top left anchor

also update tooltips
---
 data/_ui/interfaces.txt | 40 ++++++++++++++++++++--------------------
 data/_ui/tooltips.txt   |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/data/_ui/interfaces.txt b/data/_ui/interfaces.txt
index ad0f0868f127..513be5d0039d 100644
--- a/data/_ui/interfaces.txt
+++ b/data/_ui/interfaces.txt
@@ -769,25 +769,6 @@ interface "hud"
 		color "medium"
 		align left
 
-	# System Solar Power and Solar Wind display
-	visible if "system solar display"
-	sprite "ui/tactical/solar"
-		from -2205 70
-		align top left
-	string "system solar"
-		from -2188 79
-		color "medium"
-		align left
-
-	visible if "system wind display"
-	sprite "ui/tactical/wind"
-		from -2200 90
-		align top left
-	string "system wind"
-		from -2183 99
-		color "medium"
-		align left
-			
 	string "incoming"
 		from -70 320
 		color "medium"
@@ -795,7 +776,7 @@ interface "hud"
 
 
 
-	# Targets.
+	# System / Radar
 	anchor top left
 	visible if "red alert"
 	sprite "ui/red alert"
@@ -823,7 +804,26 @@ interface "hud"
 		color "medium"
 		width 135
 		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
 	sprite "ui/target"
 		from 0 240
 		align top left
diff --git a/data/_ui/tooltips.txt b/data/_ui/tooltips.txt
index 7fe6ccee7ebf..c310e16616d1 100644
--- a/data/_ui/tooltips.txt
+++ b/data/_ui/tooltips.txt
@@ -85,10 +85,10 @@ tip "atmosphere scan:"
 	`This type of scanning cannot be performed by your ship, but this outfit might be useful for certain missions.`
 
 tip "solar scan:"
-	`Allows scanning of stellar objects to determine their precise power output for display on the HUD.`
+	`Allows scanning of stellar objects to determine their precise solar power output for display on the HUD.`
 
 tip "ramscoop scan:"
-	`Allows scanning of stellar objects to determine their precise wind output for display on the HUD.`
+	`Allows scanning of stellar objects to determine their precise solar wind output for display on the HUD.`
 
 tip "bunks:"
 	`The number of people (passengers or crew) your ship can hold.`

From 5386f2d7133ebf755291fe7b8c04239a4152bdbc Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Sat, 14 Dec 2024 11:51:28 -0600
Subject: [PATCH 07/17] Update data/human/sales.txt

Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com>
---
 data/human/sales.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/human/sales.txt b/data/human/sales.txt
index 530170df7330..9ce1a8fdbca4 100644
--- a/data/human/sales.txt
+++ b/data/human/sales.txt
@@ -258,7 +258,6 @@ outfitter "Common Outfits"
 	"Pilot's License"
 	"Laser Rifle"
 	"Fuel Bar Fixed Display"
-	"Astronomical Scanner"
 	
 outfitter "Ammo North"
 	"Meteor Missile"

From 057bbe1af56709105f6e15dedfc38447cf0da590 Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Sat, 14 Dec 2024 11:53:00 -0600
Subject: [PATCH 08/17] Update Engine.cpp

---
 source/Engine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/Engine.cpp b/source/Engine.cpp
index b2de013c9820..28a02644067b 100644
--- a/source/Engine.cpp
+++ b/source/Engine.cpp
@@ -797,14 +797,14 @@ void Engine::Step(bool isActive)
 		}
 		// 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 scan"))
+		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("ramscoop scan"))
+		if(displaySystemWind >= 0.01 && flagship->Attributes().Get("solar wind sensor"))
 		{
 			info.SetCondition("system wind display");
 			info.SetString("system wind", to_string(displaySystemWind));

From 8778f8a5750f76db52d1a14f74191fc38c86fdb8 Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Sat, 14 Dec 2024 11:53:43 -0600
Subject: [PATCH 09/17] Update outfits.txt

---
 data/human/outfits.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/human/outfits.txt b/data/human/outfits.txt
index 9795f1da8659..825ed95163e1 100644
--- a/data/human/outfits.txt
+++ b/data/human/outfits.txt
@@ -298,8 +298,8 @@ outfit "Astronomical Scanner"
 	"mass" 2
 	"outfit space" -2
 	"energy consumption" .1
-	"solar scan" 1
-	"ramscoop scan" 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."
 
 

From fc98542566eb8b26f54534f66193f0458f91c85c Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Sat, 14 Dec 2024 11:58:33 -0600
Subject: [PATCH 10/17] Update tooltips.txt

---
 data/_ui/tooltips.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/_ui/tooltips.txt b/data/_ui/tooltips.txt
index 789c7d4d8035..cef70e30e0db 100644
--- a/data/_ui/tooltips.txt
+++ b/data/_ui/tooltips.txt
@@ -84,11 +84,11 @@ 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 scan:"
-	`Allows scanning of stellar objects to determine their precise solar power output for display on the HUD.`
+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 "ramscoop scan:"
-	`Allows scanning of stellar objects to determine their precise solar wind output for display on the HUD.`
+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.`

From 4aeb0a8f858ad23aa4346aba244ddaea36b795b4 Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Sat, 14 Dec 2024 11:59:02 -0600
Subject: [PATCH 11/17] Update sales.txt

---
 data/human/sales.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/human/sales.txt b/data/human/sales.txt
index 9ce1a8fdbca4..851d03f1921d 100644
--- a/data/human/sales.txt
+++ b/data/human/sales.txt
@@ -258,7 +258,7 @@ outfitter "Common Outfits"
 	"Pilot's License"
 	"Laser Rifle"
 	"Fuel Bar Fixed Display"
-	
+
 outfitter "Ammo North"
 	"Meteor Missile"
 	"Torpedo"

From db6e58aa2ff8db897ff61f1f8ada0b67bb3e48de Mon Sep 17 00:00:00 2001
From: MadisonianX <madisonianx@gmail.com>
Date: Sat, 14 Dec 2024 12:34:13 -0600
Subject: [PATCH 12/17] Update interfaces.txt

---
 data/_ui/interfaces.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/data/_ui/interfaces.txt b/data/_ui/interfaces.txt
index ab8f7cec30d5..882c3238b7eb 100644
--- a/data/_ui/interfaces.txt
+++ b/data/_ui/interfaces.txt
@@ -775,10 +775,8 @@ interface "hud"
 		from -70 320
 		color "medium"
 		align right
-
-
-
-	# System / Radar
+	
+	# Radar
 	anchor top left
 	visible if "red alert"
 	sprite "ui/red alert"
@@ -794,7 +792,6 @@ interface "hud"
 	value "radar radius" 110
 	value "radar pointer radius" 130
 	
-	# Current system.
 	sprite "ui/current system"
 		from 43 0
 		align top left
@@ -809,7 +806,6 @@ interface "hud"
 	sprite "ui/navigation"
 		from 195 0
 		align top left
-
 	string "navigation mode"
 		from 215 20
 		align left
@@ -840,6 +836,7 @@ interface "hud"
 		align left
 	
 	# Targets
+	visible
 	sprite "ui/target"
 		from 0 275
 		align top left

From b9d08c95e7c31c782e7ca5b668aa24fb5c39190b Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Tue, 24 Dec 2024 12:04:52 -0600
Subject: [PATCH 13/17] Update data/_ui/interfaces.txt

Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com>
---
 data/_ui/interfaces.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/_ui/interfaces.txt b/data/_ui/interfaces.txt
index 7036243bc88d..e6a53fdc7c8d 100644
--- a/data/_ui/interfaces.txt
+++ b/data/_ui/interfaces.txt
@@ -821,7 +821,7 @@ interface "hud"
 
 	visible if "system solar display"
 	sprite "ui/tactical/solar"
-		from 252 67
+		from 251 67
 		align top left
 	string "system solar"
 		from 269 76

From d2685d78966d1e99a6423ec43bbe21b33a53eb91 Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Tue, 24 Dec 2024 12:05:00 -0600
Subject: [PATCH 14/17] Update data/_ui/interfaces.txt

Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com>
---
 data/_ui/interfaces.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/_ui/interfaces.txt b/data/_ui/interfaces.txt
index e6a53fdc7c8d..ab7aaea66687 100644
--- a/data/_ui/interfaces.txt
+++ b/data/_ui/interfaces.txt
@@ -830,7 +830,7 @@ interface "hud"
 
 	visible if "system wind display"
 	sprite "ui/tactical/wind"
-		from 258 90
+		from 256 90
 		align top left
 	string "system wind"
 		from 275 99

From 415079ebc31d101b3b3f1564ce50af53687901ba Mon Sep 17 00:00:00 2001
From: Madisonian <madisonianx@gmail.com>
Date: Tue, 24 Dec 2024 12:05:08 -0600
Subject: [PATCH 15/17] Update data/_ui/interfaces.txt

Co-authored-by: Zitchas <32169904+Zitchas@users.noreply.github.com>
---
 data/_ui/interfaces.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/_ui/interfaces.txt b/data/_ui/interfaces.txt
index ab7aaea66687..17be0f3a3259 100644
--- a/data/_ui/interfaces.txt
+++ b/data/_ui/interfaces.txt
@@ -777,8 +777,10 @@ interface "hud"
 		from -70 320
 		color "medium"
 		align right
-	
-	# Radar
+
+
+
+	# RADAR
 	anchor top left
 	visible if "red alert"
 	sprite "ui/red alert"

From 7e1ab27f35e648413d2d79fc898ed4f84a6984d6 Mon Sep 17 00:00:00 2001
From: Zitchas <32169904+Zitchas@users.noreply.github.com>
Date: Thu, 2 Jan 2025 05:52:29 -0500
Subject: [PATCH 16/17] Adding a template copyright

Please correct as necessary. All the stuff in the comments should be removed if you entirely created both, or with a "derived from works by X" if that is the case.
---
 copyright | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/copyright b/copyright
index e81d58995b62..e12abfd06663 100644
--- a/copyright
+++ b/copyright
@@ -3928,6 +3928,15 @@ Copyright: None (placed in public domain by an anonymous author)
 License: CC0
 Comment: Uses public domain textures from texture.ninja. Meshes were made by an anonymous author in 2023-2024.
 
+Files:
+ images/outfit/astronomical?scanner*
+ images/ui/tactical/wind.png
+Copyright: MadisonianX (https://github.com/MadisonianX)
+License: CC-BY-SA-4.0
+Comment: Unclear if these are derived from anything or entirely original. If one is derived and the other original,
+ then this copyright entry can be split to have one for the one, and a second for the other.
+ (If unclear, derived means a pre-existing image was modified to get this)
+
 License: Depends
  Taken from unsplash.com. Until June 2017, this was a collection of photographs that had been donated and
  placed in the public domain. In June 2017, Unsplash modified their terms and conditions to make all images

From 702ba448f572deae5fe8219bc2415f2a49be2127 Mon Sep 17 00:00:00 2001
From: Zitchas <32169904+Zitchas@users.noreply.github.com>
Date: Tue, 21 Jan 2025 16:48:42 -0500
Subject: [PATCH 17/17] Update copyright

---
 copyright | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/copyright b/copyright
index e12abfd06663..863684f03dc1 100644
--- a/copyright
+++ b/copyright
@@ -3933,9 +3933,7 @@ Files:
  images/ui/tactical/wind.png
 Copyright: MadisonianX (https://github.com/MadisonianX)
 License: CC-BY-SA-4.0
-Comment: Unclear if these are derived from anything or entirely original. If one is derived and the other original,
- then this copyright entry can be split to have one for the one, and a second for the other.
- (If unclear, derived means a pre-existing image was modified to get this)
+Comment: wind icon is acquired from flaticon via paid subscription and, as per site instructions, does not need to be credited. As such all rights pertain to MadisonianX.
 
 License: Depends
  Taken from unsplash.com. Until June 2017, this was a collection of photographs that had been donated and