-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feat(code): Add HUD display for Solar Power and Solar Wind #164
base: experimental
Are you sure you want to change the base?
Changes from 4 commits
bca70cb
1a7205f
058ea58
17268d1
11bb06f
c82cfd7
32c5fca
ef6cb45
98ee2e5
5386f2d
057bbe1
8778f8a
fc98542
4aeb0a8
db6e58a
13edc2a
22b7f56
b9d08c9
d2685d7
415079e
593d1ed
7e1ab27
702ba44
995fedb
fa14bcd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
|
@@ -350,6 +351,7 @@ outfitter "Deep Sky Advanced" | |
"In-flight Mass Display" | ||
"Hyperjump Fuel Display" | ||
"Fuel Bar Hyperjump Display" | ||
"Astronomical Scanner" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These are a good place for this outfit for now, although in the future it might be more interesting to have it in its own outfitter and have it only available from a few worlds that mention having universities or astronomy studies, and tie it into some research missions from said places. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have it in Deep Sky Basics and Deep Sky Advanced currently, is just Advanced preferred? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Probably just advanced, I think. |
||
|
||
outfitter "Lovelace Basics" | ||
"Anti-Missile Turret" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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")) | ||
MadisonianX marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
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 | ||
// 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")) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it might be less confusing to call this "wind scan" or perhaps "solar wind scan"; although in following with my comment about the solar scan, maybe "wind sensor" or "solar wind sensor"? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sensor is fine, preferably "solar power sensor" and "solar wind sensor" so it's precise in what attribute each is sensing. Or if making them separate attributes is overkill then just "solar sensor"; I was just following the example of the tactical and strategic scanner modularity. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I personally like having them as separate values. :) could be good to have some fraction that just tracks, say, solar power. |
||
{ | ||
info.SetCondition("system wind display"); | ||
info.SetString("system wind", to_string(displaySystemWind)); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.