Skip to content
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

Bionic UI: power display in kJ, J, mJ #34753

Merged
merged 2 commits into from
Oct 18, 2019

Conversation

RDru
Copy link
Contributor

@RDru RDru commented Oct 14, 2019

Summary

SUMMARY: Interface "Bionic UI: power displayed in kJ, J or mJ"

Purpose of change

Power was always displayed in kJ

Describe the solution

Made function that return a string with value and unit.
Named it just "display" for future override for other units.

Describe alternatives you've considered

I was thinking about creating units.ccp

Testing

Loaded a save, it displays correctly.

Additional context

Also changed the description of artificial night generator that I changed in #34456 and forgot about description
obraz

@anothersimulacrum
Copy link
Member

#34706 has something very similar

@RDru RDru changed the title Bionic power display in kJ, J, mJ Bionic UI: power display in kJ, J, mJ Oct 14, 2019
@RDru
Copy link
Contributor Author

RDru commented Oct 14, 2019

#34706 has something very similar

Mine is about bionic UI window. His is about displaying total power in character panel I think (?).

@Fris0uman
Copy link
Contributor

Yep it's the panel.
Can you give a screen shot?

src/units.h Outdated Show resolved Hide resolved
@RDru
Copy link
Contributor Author

RDru commented Oct 14, 2019

Can you give a screen shot?

Added screenshot.

@ZhilkinSerg ZhilkinSerg added [C++] Changes (can be) made in C++. Previously named `Code` Bionics CBM (Compact Bionic Modules) Info / User Interface Game - player communication, menus, etc. labels Oct 15, 2019
@kevingranade kevingranade merged commit 557a387 into CleverRaven:master Oct 18, 2019
@RDru RDru deleted the bionic_power_display branch October 21, 2019 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants