Add move_count_mode_text widget to show like 50(R) (#54623)

- Define display::move_count_and_mode_text_color
- Define widget_var for move_count_mode_text
- Define move_count_mode_desc widget (not used, but documented)
- Add test (and merge with existing movement widget tests)

Author: wapcaplet

data/json/ui/movement.json

@@ -22,6 +22,14 @@
     "var": "move",
     "style": "number"
   },
+  {
+    "id": "move_count_mode_desc",
+    "type": "widget",
+    "label": "Move",
+    "style": "text",
+    "var": "move_count_mode_text",
+    "//": "Colorized movement counter and mode letter, like 100(W), from display::move_count_and_mode_text_color"
+  },
   {
     "id": "move_cost_num",
     "type": "widget",

data/mods/TEST_DATA/widgets.json

@@ -208,6 +208,13 @@
     "var": "move_mode_letter",
     "style": "text"
   },
+  {
+    "id": "test_move_count_mode_text",
+    "type": "widget",
+    "label": "MOVE/MODE",
+    "var": "move_count_mode_text",
+    "style": "text"
+  },
   {
     "id": "test_str_num",
     "type": "widget",

doc/SIDEBAR_MOD.md

@@ -626,25 +626,26 @@ Graph widget ids typically have a `_graph` suffix.
 
 Text widget ids typically have a `_desc` suffix.
 
-| id                 | example
-| --                 | --
-| `activity_desc`    | `Activity: Moderate`
-| `date_desc`        | `Date: Summer day 25`
-| `env_temp_desc`    | `Temperature: 65F`
-| `fatigue_desc`     | `Rest: Tired`
-| `health_desc`      | `Health: Good`
-| `hunger_desc`      | `Hunger: Satisfied`
-| `lighting_desc`    | `Lighting: Bright`
-| `mood_desc`        | `Mood: :-)`
-| `pain_desc`        | `Pain: Unmanageable pain`
-| `place_desc`       | `Place: Evac Shelter J-38`
-| `power_desc`       | `Bionic Power: 250mJ`
-| `style_desc`       | `Style: Brawling`
-| `time_desc`        | `Time: 10:45:32 am`
-| `weary_malus_desc` | `Weary Malus: +10%`
-| `weather_desc`     | `Weather: Sunny`
-| `weight_desc`      | `Weight: Overweight`
-| `wind_desc`        | `Wind: <= Calm`
+| id                     | example
+| --                     | --
+| `activity_desc`        | `Activity: Moderate`
+| `date_desc`            | `Date: Summer day 25`
+| `env_temp_desc`        | `Temperature: 65F`
+| `fatigue_desc`         | `Rest: Tired`
+| `health_desc`          | `Health: Good`
+| `hunger_desc`          | `Hunger: Satisfied`
+| `lighting_desc`        | `Lighting: Bright`
+| `mood_desc`            | `Mood: :-)`
+| `move_count_mode_desc` | `Move: 100(W)`
+| `pain_desc`            | `Pain: Unmanageable pain`
+| `place_desc`           | `Place: Evac Shelter J-38`
+| `power_desc`           | `Bionic Power: 250mJ`
+| `style_desc`           | `Style: Brawling`
+| `time_desc`            | `Time: 10:45:32 am`
+| `weary_malus_desc`     | `Weary Malus: +10%`
+| `weather_desc`         | `Weather: Sunny`
+| `weight_desc`          | `Weight: Overweight`
+| `wind_desc`            | `Wind: <= Calm`
 
 
 ## Layout widgets

src/display.cpp

@@ -1198,6 +1198,14 @@ std::pair<std::string, nc_color> display::move_mode_text_color( const Character
     return std::make_pair( mm_text, mm_color );
 }
 
+// Movement counter and mode letter, like "50(R)" or "100(W)"
+std::pair<std::string, nc_color> display::move_count_and_mode_text_color( const avatar &u )
+{
+    std::pair<std::string, nc_color> mode_pair = display::move_mode_letter_color( u );
+    std::string count_and_mode = string_format( "%d(%s)", u.movecounter, mode_pair.first );
+    return std::make_pair( count_and_mode, mode_pair.second );
+}
+
 std::pair<std::string, nc_color> display::overmap_note_symbol_color( const std::string note_text )
 {
     std::string ter_sym = "N";

src/display.h

@@ -100,6 +100,8 @@ std::pair<std::string, nc_color> morale_emotion( const int morale_cur, const moo
 // Current movement mode and color, as single letter or full word
 std::pair<std::string, nc_color> move_mode_letter_color( const Character &u );
 std::pair<std::string, nc_color> move_mode_text_color( const Character &u );
+// Movement counter and mode letter, like "50(R)" or "100(W)"
+std::pair<std::string, nc_color> move_count_and_mode_text_color( const avatar &u );
 // Current body part status (bleeding, bitten, infected) phrase, fully colorized
 std::string colorized_bodypart_status_text( const Character &u, const bodypart_id &bp,
         const std::string &wgt_id );

src/widget.cpp

@@ -145,6 +145,8 @@ std::string enum_to_string<widget_var>( widget_var data )
             return "mood_text";
         case widget_var::moon_phase_text:
             return "moon_phase_text";
+        case widget_var::move_count_mode_text:
+            return "move_count_mode_text";
         case widget_var::move_mode_letter:
             return "move_mode_letter";
         case widget_var::move_mode_text:
@@ -637,6 +639,7 @@ bool widget::uses_text_function()
         case widget_var::lighting_text:
         case widget_var::mood_text:
         case widget_var::moon_phase_text:
+        case widget_var::move_count_mode_text:
         case widget_var::move_mode_letter:
         case widget_var::move_mode_text:
         case widget_var::pain_text:
@@ -748,6 +751,9 @@ std::string widget::color_text_function_string( const avatar &ava, unsigned int
         case widget_var::moon_phase_text:
             desc.first = display::get_moon();
             break;
+        case widget_var::move_count_mode_text:
+            desc = display::move_count_and_mode_text_color( ava );
+            break;
         case widget_var::move_mode_letter:
             desc = display::move_mode_letter_color( ava );
             break;

src/widget.h

@@ -59,6 +59,7 @@ enum class widget_var : int {
     lighting_text,  // Current light level, color string
     mood_text,      // Mood as a text emote, color string
     moon_phase_text,// Current phase of the moon
+    move_count_mode_text, // Movement counter and mode letter like "50(R)", color string
     move_mode_letter, // Movement mode, color letter (W/R/C/P)
     move_mode_text, // Movement mode, color text (walking/running/crouching/prone)
     overmap_loc_text,// Local overmap position, pseudo latitude/longitude with Z-level

tests/widget_test.cpp

@@ -78,6 +78,7 @@ static const widget_id widget_test_int_num( "test_int_num" );
 static const widget_id widget_test_mana_num( "test_mana_num" );
 static const widget_id widget_test_morale_num( "test_morale_num" );
 static const widget_id widget_test_move_cost_num( "test_move_cost_num" );
+static const widget_id widget_test_move_count_mode_text( "test_move_count_mode_text" );
 static const widget_id widget_test_move_mode_letter( "test_move_mode_letter" );
 static const widget_id widget_test_move_mode_text( "test_move_mode_text" );
 static const widget_id widget_test_move_num( "test_move_num" );
@@ -411,15 +412,6 @@ TEST_CASE( "widgets showing avatar attributes", "[widget][avatar]" )
         CHECK( morale_w.layout( ava ) == "MORALE: -100" );
     }
 
-    SECTION( "move counter" ) {
-        widget move_w = widget_test_move_num.obj();
-
-        ava.movecounter = 80;
-        CHECK( move_w.layout( ava ) == "MOVE: 80" );
-        ava.movecounter = 150;
-        CHECK( move_w.layout( ava ) == "MOVE: 150" );
-    }
-
     SECTION( "hit points" ) {
         bodypart_id head( "head" );
         widget head_num_w = widget_test_hp_head_num.obj();
@@ -461,26 +453,51 @@ TEST_CASE( "widgets showing avatar attributes", "[widget][avatar]" )
     }
 }
 
-TEST_CASE( "widgets showing movement mode", "[widget][move_mode]" )
+TEST_CASE( "widgets showing move counter and mode", "[widget][move_mode]" )
 {
-    widget mode_letter_w = widget_test_move_mode_letter.obj();
-    widget mode_text_w = widget_test_move_mode_text.obj();
-
     avatar &ava = get_avatar();
     clear_avatar();
 
-    ava.set_movement_mode( move_mode_walk );
-    CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_white>W</color>" );
-    CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_white>walking</color>" );
-    ava.set_movement_mode( move_mode_run );
-    CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_red>R</color>" );
-    CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_red>running</color>" );
-    ava.set_movement_mode( move_mode_crouch );
-    CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_light_blue>C</color>" );
-    CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_light_blue>crouching</color>" );
-    ava.set_movement_mode( move_mode_prone );
-    CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_green>P</color>" );
-    CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_green>prone</color>" );
+    SECTION( "move counter" ) {
+        widget move_w = widget_test_move_num.obj();
+
+        ava.movecounter = 80;
+        CHECK( move_w.layout( ava ) == "MOVE: 80" );
+        ava.movecounter = 150;
+        CHECK( move_w.layout( ava ) == "MOVE: 150" );
+    }
+
+    SECTION( "move counter and mode letter" ) {
+        widget move_count_mode_w = widget_test_move_count_mode_text.obj();
+
+        ava.movecounter = 90;
+        ava.set_movement_mode( move_mode_walk );
+        CHECK( move_count_mode_w.layout( ava ) == "MOVE/MODE: <color_c_white>90(W)</color>" );
+        ava.set_movement_mode( move_mode_run );
+        CHECK( move_count_mode_w.layout( ava ) == "MOVE/MODE: <color_c_red>90(R)</color>" );
+        ava.set_movement_mode( move_mode_crouch );
+        CHECK( move_count_mode_w.layout( ava ) == "MOVE/MODE: <color_c_light_blue>90(C)</color>" );
+        ava.set_movement_mode( move_mode_prone );
+        CHECK( move_count_mode_w.layout( ava ) == "MOVE/MODE: <color_c_green>90(P)</color>" );
+    }
+
+    SECTION( "movement mode text and letter" ) {
+        widget mode_letter_w = widget_test_move_mode_letter.obj();
+        widget mode_text_w = widget_test_move_mode_text.obj();
+
+        ava.set_movement_mode( move_mode_walk );
+        CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_white>W</color>" );
+        CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_white>walking</color>" );
+        ava.set_movement_mode( move_mode_run );
+        CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_red>R</color>" );
+        CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_red>running</color>" );
+        ava.set_movement_mode( move_mode_crouch );
+        CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_light_blue>C</color>" );
+        CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_light_blue>crouching</color>" );
+        ava.set_movement_mode( move_mode_prone );
+        CHECK( mode_letter_w.layout( ava ) == "MODE: <color_c_green>P</color>" );
+        CHECK( mode_text_w.layout( ava ) == "MODE: <color_c_green>prone</color>" );
+    }
 }
 
 TEST_CASE( "widgets showing movement cost", "[widget][move_cost]" )