Expand widget clauses: JSONify bp_status_sym_text

Author: dseguin

data/json/ui/bodypart_status.json

@@ -85,8 +85,7 @@
     "id": "bodypart_status_sym_text",
     "//": "Base widget for body part status symbols; needs bodypart field defined in derived widget.",
     "type": "widget",
-    "style": "text",
-    "var": "bp_status_sym_text",
+    "style": "symbol",
     "text_align": "left",
     "copy-from": "bodypart_status_indicator_template"
   },

data/mods/TEST_DATA/widgets.json

@@ -425,17 +425,15 @@
   {
     "id": "test_status_sym_torso_text",
     "type": "widget",
-    "style": "text",
-    "var": "bp_status_sym_text",
+    "style": "symbol",
     "label": "TORSO",
     "bodypart": "torso",
     "copy-from": "test_bp_status_indicator_template"
   },
   {
     "id": "test_status_sym_left_arm_text",
     "type": "widget",
-    "style": "text",
-    "var": "bp_status_sym_text",
+    "style": "symbol",
     "label": "L ARM",
     "bodypart": "arm_l",
     "copy-from": "test_bp_status_indicator_template"

src/display.cpp

@@ -1089,23 +1089,6 @@ static const std::string &sym_for_bp_status( const bodypart_status &stat )
     return sym == symmap.end() ? none : sym->second;
 }
 
-std::string display::colorized_bodypart_status_sym_text( const Character &u, const bodypart_id &bp,
-        const std::string &wgt_id )
-{
-    std::string ret;
-    widget_id wid( wgt_id );
-    for( const auto &bpcol : bodypart_status_colors( u, bp, wgt_id ) ) {
-        std::string sym;
-        if( wid.is_valid() ) {
-            // Check if there's a phrase defining this status' symbol
-            sym = widget_phrase::get_sym_for_id( io::enum_to_string( bpcol.first ), wid );
-        }
-        sym = sym.empty() ? sym_for_bp_status( bpcol.first ) : sym;
-        ret += colorize( sym, bpcol.second );
-    }
-    return ret;
-}
-
 std::string display::colorized_bodypart_status_legend_text( const Character &u,
         const std::set<bodypart_id> &bplist, const std::string &wgt_id, int width, int max_height,
         int &height )

src/display.h

@@ -102,9 +102,6 @@ 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_sym_text( const Character &u, const bodypart_id &bp,
-        const std::string &wgt_id );
 std::string colorized_bodypart_status_legend_text( const Character &u,
         const std::set<bodypart_id> &bplist, const std::string &wgt_id, int width, int max_height,
         int &height );

src/widget.cpp

@@ -124,8 +124,6 @@ std::string enum_to_string<widget_var>( widget_var data )
             return "body_temp_text";
         case widget_var::bp_armor_outer_text:
             return "bp_armor_outer_text";
-        case widget_var::bp_status_sym_text:
-            return "bp_status_sym_text";
         case widget_var::bp_status_legend_text:
             return "bp_status_legend_text";
         case widget_var::date_text:
@@ -839,7 +837,6 @@ bool widget::uses_text_function()
         case widget_var::activity_text:
         case widget_var::body_temp_text:
         case widget_var::bp_armor_outer_text:
-        case widget_var::bp_status_sym_text:
         case widget_var::bp_status_legend_text:
         case widget_var::compass_text:
         case widget_var::compass_legend_text:
@@ -895,7 +892,7 @@ static std::set<bodypart_id> get_bodyparts_from_status_widgets()
 {
     std::set<bodypart_id> ret;
     for( const widget &w : widget::get_all() ) {
-        if( w._var == widget_var::bp_status_sym_text ) {
+        if( !w._bps.empty() ) {
             ret.emplace( w.only_bp() );
         }
     }
@@ -928,10 +925,6 @@ std::string widget::color_text_function_string( const avatar &ava, unsigned int
             desc.first = display::colorized_bodypart_outer_armor( ava, only_bp() );
             apply_color = false; // Item name already colorized by tname
             break;
-        case widget_var::bp_status_sym_text:
-            desc.first = display::colorized_bodypart_status_sym_text( ava, only_bp(), id.str() );
-            apply_color = false; // Already colorized
-            break;
         case widget_var::bp_status_legend_text:
             desc.first = display::colorized_bodypart_status_legend_text( ava,
                          get_bodyparts_from_status_widgets(), id.str(),

src/widget.h

@@ -46,7 +46,6 @@ enum class widget_var : int {
     activity_text,  // Activity level text, color string
     body_temp_text, // Felt body temperature, color string
     bp_armor_outer_text, // Outermost armor on body part, with color/damage bars
-    bp_status_sym_text, // Status of bodypart (same as above, but shortened to 1 char per status)
     bp_status_legend_text, // Legend describing the status indicators from bp_status_sym_text
     compass_text,   // Compass / visible threats by cardinal direction
     compass_legend_text, // Names of visible creatures that appear on the compass