Add bodygraph with wetness data (CleverRaven#63158)

Willenbrink · Jan 25, 2023 · ef30cc2 · ef30cc2
1 parent b1eeab2
commit ef30cc2
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 10 deletions.
diff --git a/src/character_body.cpp b/src/character_body.cpp
@@ -163,14 +163,14 @@ void Character::update_body_wetness( const w_point &weather )
         }
 
         // Add effects to track wetness
-        const int updatedWetness = get_part_wetness( bp );
-        const int wetnessCapacity = get_part_drench_capacity( bp );
-        if( updatedWetness < wetnessCapacity * .3 ) {
-            add_effect( effect_wet, 1_turns, bp, true, 1 );
-        } else if( updatedWetness < wetnessCapacity * .6 ) {
-            add_effect( effect_wet, 1_turns, bp, true, 2 );
-        } else if( updatedWetness < wetnessCapacity ) {
-            add_effect( effect_wet, 1_turns, bp, true, 3 );
+        if( get_part_wetness( bp ) > 0 ) {
+            const float wetness_pct = get_part_wetness_percentage( bp );
+            const int effect_level =
+                wetness_pct < BODYWET_PERCENT_WET ? 1 :
+                wetness_pct < BODYWET_PERCENT_SOAKED ? 2 :
+                3;
+
+            add_effect( effect_wet, 1_turns, bp, true, effect_level );
         }
     }
 }

diff --git a/src/display.cpp b/src/display.cpp
@@ -39,11 +39,12 @@ static const itype_id fuel_type_muscle( "muscle" );
 // Cache for the overmap widget string
 static disp_overmap_cache disp_om_cache;
 // Cache for the bodygraph widget string
-static std::array<disp_bodygraph_cache, 4> disp_bg_cache = { {
+static std::array<disp_bodygraph_cache, 5> disp_bg_cache = { {
         disp_bodygraph_cache( bodygraph_var::hp ),
         disp_bodygraph_cache( bodygraph_var::temp ),
         disp_bodygraph_cache( bodygraph_var::encumb ),
-        disp_bodygraph_cache( bodygraph_var::status )
+        disp_bodygraph_cache( bodygraph_var::status ),
+        disp_bodygraph_cache( bodygraph_var::wet )
     }
 };
 
@@ -1600,6 +1601,21 @@ nc_color display::get_bodygraph_bp_color( const Character &u, const bodypart_id
         case bodygraph_var::status: {
             return display::limb_color( u, bid, true, true, true );
         }
+        case bodygraph_var::wet: {
+            const int cur_wet = u.get_part_wetness( bid );
+            if( cur_wet == 0 ) {
+                return c_light_gray; // dry
+            } else {
+                const float cur_wet = u.get_part_wetness_percentage( bid );
+                if( cur_wet < BODYWET_PERCENT_WET ) {
+                    return c_light_cyan;
+                } else if( cur_wet < BODYWET_PERCENT_SOAKED ) {
+                    return c_light_blue;
+                } else {
+                    return c_blue; // maximum wetness
+                }
+            }
+        }
         // Fall-through - invalid
         case bodygraph_var::last:
             break;

diff --git a/src/display.h b/src/display.h
@@ -12,6 +12,7 @@ enum class bodygraph_var : int {
     temp,        // temperature
     encumb,      // encumbrance
     status,      // limb status (bite, bleeding, ...)
+    wet,         // wetness
     last // END OF ENUMS
 };
 

diff --git a/src/weather.h b/src/weather.h
@@ -45,6 +45,13 @@ static constexpr int BODYTEMP_SCORCHING = 9500;
 static constexpr int BODYTEMP_THRESHOLD = 500;
 ///@}
 
+// Wetness percentage 0.0f is DRY
+// Level 1 wetness (DAMP) is between 0.0f and Level 2
+// Level 2 wetness percentage
+static constexpr float BODYWET_PERCENT_WET = 0.3f;
+// Level 3 wetness percentage
+static constexpr float BODYWET_PERCENT_SOAKED = 0.6f;
+
 // Rough tresholds for sunlight intensity in W/m2.
 namespace irradiance
 {

diff --git a/src/widget.cpp b/src/widget.cpp
@@ -135,6 +135,8 @@ std::string enum_to_string<widget_var>( widget_var data )
             return "body_graph_encumb";
         case widget_var::body_graph_status:
             return "body_graph_status";
+        case widget_var::body_graph_wet:
+            return "body_graph_wet";
         case widget_var::bp_armor_outer_text:
             return "bp_armor_outer_text";
         case widget_var::carry_weight_text:
@@ -1000,6 +1002,7 @@ bool widget::uses_text_function() const
         case widget_var::body_graph_temp:
         case widget_var::body_graph_encumb:
         case widget_var::body_graph_status:
+        case widget_var::body_graph_wet:
         case widget_var::bp_armor_outer_text:
         case widget_var::carry_weight_text:
         case widget_var::compass_text:
@@ -1092,6 +1095,12 @@ std::string widget::color_text_function_string( const avatar &ava, unsigned int
             update_height = true; // Dynamically adjusted height
             apply_color = false; // Already colorized
             break;
+        case widget_var::body_graph_wet:
+            desc.first = display::colorized_bodygraph_text( ava, _body_graph,
+                         bodygraph_var::wet, _width == 0 ? max_width : _width, _height_max, _height );
+            update_height = true; // Dynamically adjusted height
+            apply_color = false; // Already colorized
+            break;
         case widget_var::bp_armor_outer_text:
             desc.first = ava.worn.get_armor_display( only_bp() );
             apply_color = false; // Item name already colorized by tname

diff --git a/src/widget.h b/src/widget.h
@@ -50,6 +50,7 @@ enum class widget_var : int {
     body_graph_temp,     // Body graph showing color-coded body part temperature
     body_graph_encumb,     // Body graph showing color-coded body part encumbrance
     body_graph_status,     // Body graph showing color-coded body part status (bite, bleeding, ...)
+    body_graph_wet,        // Body graph showing color-coded body part wetness
     bp_armor_outer_text, // Outermost armor on body part, with color/damage bars
     carry_weight_text,   // Weight carried, relative to capacity, in %
     compass_text,   // Compass / visible threats by cardinal direction