Make constructions in progress display the progress percentage. #36020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This project has a specific code style. See doc/CODE_STYLE.md. |
ZhilkinSerg
added
[C++]
…ost other crafting.
ishtatann
force-pushed
the
construction-progress
branch
from
a31ca01 to
3cb822b
Compare
BevapDin
reviewed
Dec 11, 2019
| @@ -104,8 +105,20 @@ cata::optional<std::string> player_activity::get_progress_message( const avatar | |||
| type == activity_id( "ACT_CHOP_LOGS" ) || | |||
| type == activity_id( "ACT_CHOP_PLANKS" ) | |||
| ) { | |||
| const int percentage = ( ( moves_total - moves_left ) * 100 ) / moves_total; | |||
There was a problem hiding this comment.
Suggested change
| const int percentage = ( ( moves_total - moves_left ) * 100 ) / moves_total; | |
| const int percentage = ( moves_total - moves_left ) * 100 / moves_total; |
There was a problem hiding this comment.
I just moved this line I didn't add any additional parens.
Also, I prefer the explicit parens to the implicit depending on the order of operations.
BevapDin
reviewed
Dec 11, 2019
BevapDin
reviewed
Dec 11, 2019
| if( type == activity_id( "ACT_BUILD" ) ) { | ||
| partial_con *pc = g->m.partial_con_at( g->m.getlocal( u.activity.placement ) ); | ||
| if( pc ) { | ||
| int counter = std::min( pc->counter, 10000000 ); |
There was a problem hiding this comment.
I wonder why the next variable is const, bu this one isn't?
There was a problem hiding this comment.
The original percentage line above was const. I just copied that line and modified it.
I'm not a huge fan of const'ing everything under the sun so don't typically add it to variables I declare.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Interface "Make constructions in progress display the progress percentage."Purpose of change
Small display change to show percentage of completion for construction tasks.
Describe the solution
Updated player_activity::get_progress_message to get the counter from the partial construction being worked on.
Testing
Loaded up a game and made a charcoal kiln - verified the progress display includes the percentage now.