Skip to content

Commit

Permalink
Fix: Use same hunger names in consume menu as in sidebar (#71142)
Browse files Browse the repository at this point in the history
* Fix: Use same hunger names in consume menu as in sidebar

Updates consume menu so that it shows the same names for hunger as what
is used in the sidebar widget.

Names in `display::hunger_text_color` should use same names and colors
as `data/json/ui/hunger.json`.

This commit also updates color for "Overweight" in the conume menu so
that it uses the same color as in sidebar widget from
`data/json/ui/weight.json`.

* Update src/display.cpp

* Update src/display.cpp

---------

Co-authored-by: Maleclypse <[email protected]>
  • Loading branch information
inogenous and Maleclypse authored Jan 27, 2024
1 parent ab85289 commit cbc8b0b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,8 @@ std::pair<std::string, nc_color> display::hunger_text_color( const Character &u
std::forward_as_tuple( effect_hunger_full, translate_marker( "Full" ), c_yellow ),
std::forward_as_tuple( effect_hunger_satisfied, translate_marker( "Satisfied" ), c_green ),
std::forward_as_tuple( effect_hunger_blank, "", c_white ),
std::forward_as_tuple( effect_hunger_hungry, translate_marker( "Hungry" ), c_yellow ),
std::forward_as_tuple( effect_hunger_very_hungry, translate_marker( "Very hungry" ), c_yellow ),
std::forward_as_tuple( effect_hunger_hungry, translate_marker( "Peckish" ), c_light_gray ),
std::forward_as_tuple( effect_hunger_very_hungry, translate_marker( "Hungry" ), c_yellow ),
std::forward_as_tuple( effect_hunger_near_starving, translate_marker( "Near starving" ), c_red ),
std::forward_as_tuple( effect_hunger_starving, translate_marker( "Starving!" ), c_red ),
std::forward_as_tuple( effect_hunger_famished, translate_marker( "Famished" ), c_light_red )
Expand Down Expand Up @@ -780,7 +780,7 @@ std::pair<std::string, nc_color> display::weight_text_color( const Character &u
weight_color = c_light_red;
} else if( bmi > character_weight_category::overweight ) {
weight_string = translate_marker( "Overweight" );
weight_color = c_yellow;
weight_color = c_light_gray;
} else if( bmi > character_weight_category::normal ) {
weight_string = translate_marker( "Normal" );
weight_color = c_light_gray;
Expand Down

0 comments on commit cbc8b0b

Please sign in to comment.