Merge pull request #82505 from RenechCDDA/funny_armor_table

Maleclypse · web-flow · commit 2232afecf0ec · 2025-08-23T01:06:17.000-05:00
Make armor value displays into a table
diff --git a/src/item.cpp b/src/item.cpp
@@ -3770,7 +3770,7 @@ bool item::armor_full_protection_info( std::vector<iteminfo> &info,
             for( const translation &entry : to_print ) {
                 coverage += string_format( _( " The <info>%s</info>." ), entry );
             }
-            info.emplace_back( "ARMOR", coverage );
+            info.emplace_back( "DESCRIPTION", coverage );
 
             // the following function need one representative sub limb from which to query data
             armor_material_info( info, parts, 0, false, *p.sub_coverage.begin() );
@@ -3855,7 +3855,8 @@ void item::armor_protection_info( std::vector<iteminfo> &info, const iteminfo_qu
             layering += string_format( " <stat>%s</stat>.", item::layer_to_string( ll ) );
         }
         //~ Limb-specific coverage (%s = name of limb)
-        info.emplace_back( "DESCRIPTION", string_format( _( "<bold>Coverage</bold>:%s" ), layering ) );
+        info.emplace_back( "SPECIAL_ARMOR_GRAPH", string_format( _( "<bold>Coverage</bold>:%s" ),
+                           layering ) );
         //~ Regular/Default coverage
         info.emplace_back( bp_cat, string_format( "%s%s%s", space, _( "Default:" ), space ), "",
                            iteminfo::no_flags, get_coverage( sbp ) );
@@ -3896,15 +3897,16 @@ void item::armor_protection_info( std::vector<iteminfo> &info, const iteminfo_qu
         bool display_median = percent_best < 50 && percent_worst < 50;
 
         if( display_median ) {
-            info.emplace_back( "DESCRIPTION",
-                               string_format( "<bold>%s</bold>: <bad>%d%%</bad>, <color_c_yellow>Median</color>, <good>%d%%</good>",
+            info.emplace_back( "SPECIAL_ARMOR_GRAPH",
+                               string_format( "<bold>%s</bold>: <bad>%d%%</bad> chance, <color_c_yellow>Median</color> chance, <good>%d%%</good> chance",
                                               _( "Protection" ), percent_worst, percent_best ) );
         } else if( percent_worst > 0 ) {
-            info.emplace_back( "DESCRIPTION",
-                               string_format( "<bold>%s</bold>: <bad>%d%%</bad>, <good>%d%%</good>", _( "Protection" ),
+            info.emplace_back( "SPECIAL_ARMOR_GRAPH",
+                               string_format( "<bold>%s</bold>: <bad>%d%%</bad> chance, <good>%d%%</good> chance",
+                                              _( "Protection" ),
                                               percent_worst, percent_best ) );
         } else {
-            info.emplace_back( "DESCRIPTION", string_format( "<bold>%s</bold>:", _( "Protection" ) ) );
+            info.emplace_back( "SPECIAL_ARMOR_GRAPH", string_format( "<bold>%s</bold>:", _( "Protection" ) ) );
         }
 
         for( const damage_info_order &dio : damage_info_order::get_all(
@@ -3976,7 +3978,7 @@ void item::armor_material_info( std::vector<iteminfo> &info, const iteminfo_quer
     if( parts->test( iteminfo_parts::ARMOR_MATERIALS ) ) {
         const std::string space = "  ";
         // NOLINTNEXTLINE(cata-translate-string-literal)
-        std::string bp_cat = string_format( "ARMOR" );
+        std::string bp_cat = string_format( "DESCRIPTION" );
         std::string materials_list;
         std::string units_info = pgettext( "length unit: milimeter", "mm" );
         for( const part_material *mat : armor_made_of( sbp ) ) {
diff --git a/src/output.cpp b/src/output.cpp
@@ -1160,7 +1160,7 @@ std::string format_item_info( const std::vector<iteminfo> &vItemDisplay,
     bool bIsNewLine = true;
 
     for( const iteminfo &i : vItemDisplay ) {
-        if( i.sType == "DESCRIPTION" ) {
+        if( i.sType == "DESCRIPTION" || i.sType == "SPECIAL_ARMOR_GRAPH" ) {
             // Always start a new line for sType == "DESCRIPTION"
             if( !bIsNewLine ) {
                 buffer += "\n";
@@ -1268,6 +1268,75 @@ static nc_color get_comparison_color( const iteminfo &i,
     return thisColor;
 }
 
+static std::vector<std::string> delimit_armor_text( const iteminfo &i )
+{
+    const std::string &raw_text = i.sName;
+    // The various lines of text that can be passed in from item::armor_protection_info():
+    //
+    // Protection:
+    // Bash: 2.00, 8.00, 20.00
+    // Foo: 6.00, 12.00
+    //
+    // Yes that first one has no numbers. It puts the value into sValue.
+    // So we need multiple passes.
+    std::vector<std::string> first_pass = string_split( raw_text, ':' );
+    if( first_pass.size() == 2 && i.sValue != "-999" ) {
+        // Then the value is in sValue and we need to extract it.
+        // So just overwrite the second (empty) string that we just split off.
+        first_pass[1] = i.sValue;
+    }
+    const std::string mega_string = string_join( first_pass, ", " );
+    const std::vector<std::string> delimited_strings = string_split( mega_string, ',' );
+    return delimited_strings;
+}
+
+static void draw_armor_table( const std::vector<iteminfo> &vItemDisplay, const iteminfo &i )
+{
+    if( ImGui::BeginTable( "##ITEMINFO_ARMOR_TABLE", delimit_armor_text( i ).size(),
+                           ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV ) ) {
+        auto info_iter = vItemDisplay.begin() + std::distance( vItemDisplay.data(), &i );
+        if( info_iter == vItemDisplay.end() ) {
+            // PANIC!
+            ImGui::EndTable();
+            return;
+        }
+
+        const std::vector<std::string> chopped_up = delimit_armor_text( *info_iter );
+        for( const std::string &cell_text : chopped_up ) {
+            // this prefix prevents imgui from drawing the text. We still have color tags, which imgui won't parse, so we don't want those exposed to the user.
+            // But we still want proper column IDs. So we put them in, but we *hide them* with this.
+            // This results in a column with an ID of e.g.
+            // ##<color_white>Protection:</color>
+            //
+            // Not great for debugging, but better than having a column with default (randomly generated number) ID!
+            const std::string invisible_ID_label = "##" + cell_text;
+            ImGui::TableSetupColumn( invisible_ID_label.c_str(), ImGuiTableColumnFlags_WidthStretch );
+        }
+        ImGui::TableHeadersRow();
+        // After putting in the invisible labels in the last for-loop, this writes the actual text. Just the same text without the ## marker, and
+        // with our native functions doing the drawing. (So we parse color tags)
+        for( size_t i = 0; i < chopped_up.size(); i++ ) {
+            ImGui::TableSetColumnIndex( i );
+            cataimgui::draw_colored_text( chopped_up[i], c_unset );
+        }
+
+        info_iter++;
+
+        while( info_iter != vItemDisplay.end() && info_iter->sType == "ARMOR" ) {
+            ImGui::TableNextRow();
+            const std::vector<std::string> delimited_strings = delimit_armor_text( *info_iter );
+            for( const std::string &text : delimited_strings ) {
+                ImGui::TableNextColumn();
+                cataimgui::draw_colored_text( text, c_unset );
+            }
+            info_iter++;
+        }
+
+
+        ImGui::EndTable();
+    }
+}
+
 void display_item_info( const std::vector<iteminfo> &vItemDisplay,
                         const std::vector<iteminfo> &vItemCompare )
 {
@@ -1276,7 +1345,9 @@ void display_item_info( const std::vector<iteminfo> &vItemDisplay,
         if( i.bIsArt ) {
             cataimgui::PushMonoFont();
         }
-        if( i.sType == "DESCRIPTION" ) {
+        if( i.sType == "SPECIAL_ARMOR_GRAPH" ) {
+            draw_armor_table( vItemDisplay, i );
+        } else if( i.sType == "DESCRIPTION" ) {
             if( i.bDrawName ) {
                 if( i.sName == "--" ) {
                     if( !bAlreadyHasNewLine ) {
@@ -1298,7 +1369,7 @@ void display_item_info( const std::vector<iteminfo> &vItemDisplay,
                     bAlreadyHasNewLine = false;
                 }
             }
-        } else {
+        } else if( i.sType != "ARMOR" ) { // ARMOR is handled by draw_armor_table()
             if( i.bDrawName ) {
                 cataimgui::TextColoredParagraph( c_light_gray, i.sName );
                 bAlreadyHasNewLine = false;
diff --git a/src/ui_iteminfo.h b/src/ui_iteminfo.h
@@ -12,7 +12,7 @@ class iteminfo_window : public cataimgui::window
 {
     public:
         iteminfo_window( item_info_data &info, point pos, int width, int height,
-                         ImGuiWindowFlags flags = ImGuiWindowFlags_None );
+                         ImGuiWindowFlags flags = ImGuiWindowFlags_NoNavInputs );
         void execute();
 
     protected:
diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp
@@ -1542,7 +1542,7 @@ TEST_CASE( "armor_protection", "[iteminfo][armor][protection]" )
             "<color_c_white>Coverage</color>: <color_c_light_blue>Close to skin</color>.\n"
             "  Default:  <color_c_yellow>100</color>\n";
         const std::string protection_str =
-            "<color_c_white>Protection</color>: <color_c_red>4%</color>, <color_c_yellow>Median</color>, <color_c_green>4%</color>\n";
+            "<color_c_white>Protection</color>: <color_c_red>4%</color> chance, <color_c_yellow>Median</color> chance, <color_c_green>4%</color> chance\n";
         const std::string bash_str =
             "  Bash:  <color_c_red>1.00</color>, <color_c_yellow>12.00</color>, <color_c_green>23.00</color>\n";
         const std::string cut_str =

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class iteminfo_window : public cataimgui::window`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`	`14`	`iteminfo_window( item_info_data &info, point pos, int width, int height,`
`15`		`- ImGuiWindowFlags flags = ImGuiWindowFlags_None );`
	`15`	`+ ImGuiWindowFlags flags = ImGuiWindowFlags_NoNavInputs );`
`16`	`16`	`void execute();`
`17`	`17`
`18`	`18`	`protected:`