Expand widget clauses: JSONify bp_status_text

Author: dseguin

data/json/ui/bodypart_status.json

@@ -4,23 +4,81 @@
     "type": "widget",
     "style": "phrase",
     "phrases": [
-      { "id": "bitten", "text": "bitten", "sym": "B", "color": "yellow" },
-      { "id": "infected", "text": "infected", "sym": "I", "color": "pink" },
-      { "id": "broken", "text": "broken", "sym": "%", "color": "magenta" },
-      { "id": "splinted", "text": "splinted", "sym": "=", "color": "light_gray" },
-      { "id": "bandaged", "text": "bandaged", "sym": "+", "color": "white" },
-      { "id": "disinfected", "text": "disinfected", "sym": "$", "color": "light_green" },
-      { "id": "bleeding", "text": "bleeding", "value": 0, "sym": "b", "color": "light_red" },
-      { "id": "bleeding", "text": "bleeding", "value": 11, "sym": "b", "color": "red" },
-      { "id": "bleeding", "text": "bleeding", "value": 21, "sym": "b", "color": "red_red" }
+      { "id": "bitten", "text": "bitten", "sym": "B", "color": "yellow", "condition": { "u_has_effect": "bite" } },
+      {
+        "id": "infected",
+        "text": "infected",
+        "sym": "I",
+        "color": "pink",
+        "condition": { "u_has_effect": "infected" }
+      },
+      {
+        "id": "broken",
+        "text": "broken",
+        "sym": "%",
+        "color": "magenta",
+        "condition": { "compare_int": [ { "u_val": "hp" }, "==", { "const": 0 } ] }
+      },
+      {
+        "id": "splinted",
+        "text": "splinted",
+        "sym": "=",
+        "color": "light_gray",
+        "condition": { "u_has_worn_with_flag": "SPLINT" }
+      },
+      {
+        "id": "bandaged",
+        "text": "bandaged",
+        "sym": "+",
+        "color": "white",
+        "condition": { "u_has_effect": "bandaged" }
+      },
+      {
+        "id": "disinfected",
+        "text": "disinfected",
+        "sym": "$",
+        "color": "light_green",
+        "condition": { "u_has_effect": "disinfected" }
+      },
+      {
+        "id": "bleeding",
+        "text": "bleeding",
+        "sym": "b",
+        "color": "light_red",
+        "condition": {
+          "and": [
+            { "u_has_effect": "bleed", "intensity": 1 },
+            { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] }
+          ]
+        }
+      },
+      {
+        "id": "bleeding",
+        "text": "bleeding",
+        "sym": "b",
+        "color": "red",
+        "condition": {
+          "and": [
+            { "u_has_effect": "bleed", "intensity": 11 },
+            { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] }
+          ]
+        }
+      },
+      {
+        "id": "bleeding",
+        "text": "bleeding",
+        "sym": "b",
+        "color": "red_red",
+        "condition": { "u_has_effect": "bleed", "intensity": 21 }
+      }
     ]
   },
   {
     "id": "bodypart_status_text",
     "//": "Base widget for showing body part status; needs bodypart field defined in derived widget.",
     "type": "widget",
     "style": "text",
-    "var": "bp_status_text",
+    "default_phrase": { "text": "--" },
     "copy-from": "bodypart_status_indicator_template"
   },
   {

data/mods/TEST_DATA/widgets.json

@@ -4,15 +4,73 @@
     "type": "widget",
     "style": "phrase",
     "phrases": [
-      { "id": "bitten", "text": "bitten", "sym": "B", "color": "yellow" },
-      { "id": "infected", "text": "infected", "sym": "I", "color": "pink" },
-      { "id": "broken", "text": "broken", "sym": "%", "color": "magenta" },
-      { "id": "splinted", "text": "splinted", "sym": "=", "color": "light_gray" },
-      { "id": "bandaged", "text": "bandaged", "sym": "+", "color": "white" },
-      { "id": "disinfected", "text": "disinfected", "sym": "$", "color": "light_green" },
-      { "id": "bleeding", "text": "bleeding", "value": 0, "sym": "b", "color": "light_red" },
-      { "id": "bleeding", "text": "bleeding", "value": 11, "sym": "b", "color": "red" },
-      { "id": "bleeding", "text": "bleeding", "value": 21, "sym": "b", "color": "red_red" }
+      { "id": "bitten", "text": "bitten", "sym": "B", "color": "yellow", "condition": { "u_has_effect": "bite" } },
+      {
+        "id": "infected",
+        "text": "infected",
+        "sym": "I",
+        "color": "pink",
+        "condition": { "u_has_effect": "infected" }
+      },
+      {
+        "id": "broken",
+        "text": "broken",
+        "sym": "%",
+        "color": "magenta",
+        "condition": { "compare_int": [ { "u_val": "hp" }, "==", { "const": 0 } ] }
+      },
+      {
+        "id": "splinted",
+        "text": "splinted",
+        "sym": "=",
+        "color": "light_gray",
+        "condition": { "u_has_worn_with_flag": "SPLINT" }
+      },
+      {
+        "id": "bandaged",
+        "text": "bandaged",
+        "sym": "+",
+        "color": "white",
+        "condition": { "u_has_effect": "bandaged" }
+      },
+      {
+        "id": "disinfected",
+        "text": "disinfected",
+        "sym": "$",
+        "color": "light_green",
+        "condition": { "u_has_effect": "disinfected" }
+      },
+      {
+        "id": "bleeding",
+        "text": "bleeding",
+        "sym": "b",
+        "color": "light_red",
+        "condition": {
+          "and": [
+            { "u_has_effect": "bleed", "intensity": 1 },
+            { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 11 } ] }
+          ]
+        }
+      },
+      {
+        "id": "bleeding",
+        "text": "bleeding",
+        "sym": "b",
+        "color": "red",
+        "condition": {
+          "and": [
+            { "u_has_effect": "bleed", "intensity": 11 },
+            { "compare_int": [ { "u_val": "effect_intensity", "effect": "bleed" }, "<", { "const": 21 } ] }
+          ]
+        }
+      },
+      {
+        "id": "bleeding",
+        "text": "bleeding",
+        "sym": "b",
+        "color": "red_red",
+        "condition": { "u_has_effect": "bleed", "intensity": 21 }
+      }
     ]
   },
   {
@@ -350,18 +408,18 @@
     "id": "test_status_torso_text",
     "type": "widget",
     "label": "TORSO STATUS",
-    "var": "bp_status_text",
     "bodypart": "torso",
     "style": "text",
+    "default_phrase": { "text": "--" },
     "copy-from": "test_bp_status_indicator_template"
   },
   {
     "id": "test_status_left_arm_text",
     "type": "widget",
     "label": "LEFT ARM STATUS",
-    "var": "bp_status_text",
     "bodypart": "arm_l",
     "style": "text",
+    "default_phrase": { "text": "--" },
     "copy-from": "test_bp_status_indicator_template"
   },
   {

src/display.cpp

@@ -1072,26 +1072,6 @@ static std::map<bodypart_status, nc_color> bodypart_status_colors( const Charact
     return ret;
 }
 
-std::string display::colorized_bodypart_status_text( const Character &u, const bodypart_id &bp,
-        const std::string &wgt_id )
-{
-    // Colorized strings for each status
-    std::vector<std::string> color_strings;
-    widget_id wid( wgt_id );
-    // Get all status strings and colorize them
-    for( const auto &sc : bodypart_status_colors( u, bp, wgt_id ) ) {
-        std::string txt = io::enum_to_string( sc.first );
-        if( wid.is_valid() ) {
-            // Check if there's a phrase defining this status' text
-            translation t = widget_phrase::get_text_for_id( txt, wid );
-            txt = t.empty() ? txt : t.translated();
-        }
-        color_strings.emplace_back( colorize( txt, sc.second ) );
-    }
-    // Join with commas, or return "--" if no statuses
-    return color_strings.empty() ? "--" : join( color_strings, ", " );
-}
-
 static const std::string &sym_for_bp_status( const bodypart_status &stat )
 {
     static const std::string none = ".";
@@ -1150,7 +1130,36 @@ std::string display::colorized_bodypart_status_legend_text( const Character &u,
             }
         }
     }
-    return format_widget_multiline( keys, max_height, width, height );
+    // Split legend keys into X lines, where X = height.
+    // Lines use the provided width.
+    // This effectively limits the text to a 'width'x'height' box.
+    std::string ret;
+    height = 0;
+    const int h_max = max_height == 0 ? INT_MAX : max_height;
+    const int nsize = keys.size();
+    for( int row = 0, nidx = 0; row < h_max && nidx < nsize; row++ ) {
+        int wavail = width;
+        int nwidth = utf8_width( keys[nidx], true );
+        bool startofline = true;
+        while( nidx < nsize && ( wavail > nwidth || startofline ) ) {
+            startofline = false;
+            wavail -= nwidth;
+            ret += keys[nidx];
+            nidx++;
+            if( nidx < nsize ) {
+                nwidth = utf8_width( keys[nidx], true );
+                if( wavail > nwidth ) {
+                    ret += "  ";
+                    wavail -= 2;
+                }
+            }
+        }
+        if( row < h_max - 1 ) {
+            ret += "\n";
+        }
+        height++;
+    }
+    return ret;
 }
 
 std::string display::colorized_bodypart_outer_armor( const Character &u, const bodypart_id &bp )

src/display.h

@@ -103,8 +103,6 @@ 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 );
 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,

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_text:
-            return "bp_status_text";
         case widget_var::bp_status_sym_text:
             return "bp_status_sym_text";
         case widget_var::bp_status_legend_text:
@@ -841,7 +839,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_text:
         case widget_var::bp_status_sym_text:
         case widget_var::bp_status_legend_text:
         case widget_var::compass_text:
@@ -931,10 +928,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_text:
-            desc.first = display::colorized_bodypart_status_text( ava, only_bp(), id.str() );
-            apply_color = false; // Has embedded color already
-            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

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_text, // Status of bodypart (bleeding, bitten, and/or infected)
     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