Merge pull request #44974 from Robik81/prof_search_fix

Fix of proficiency search in crafting menu

src/recipe.cpp

@@ -669,6 +669,21 @@ std::string recipe::missing_proficiencies_string( const Character *c ) const
     return missing;
 }
 
+std::string recipe::recipe_proficiencies_string() const
+{
+    std::vector<proficiency_id> profs;
+
+    for( const recipe_proficiency &rec : proficiencies ) {
+        profs.push_back( rec.id );
+    }
+    std::string list = enumerate_as_string( profs.begin(),
+    profs.end(), [&]( const proficiency_id & id ) {
+        return id->name();
+    } );
+
+    return list;
+}
+
 std::set<proficiency_id> recipe::required_proficiencies() const
 {
     std::set<proficiency_id> ret;

src/recipe.h

@@ -169,6 +169,8 @@ class recipe
         std::string required_proficiencies_string( const Character *c ) const;
         std::string used_proficiencies_string( const Character *c ) const;
         std::string missing_proficiencies_string( const Character *c ) const;
+        // Proficiencies for search
+        std::string recipe_proficiencies_string() const;
         // Required proficiencies
         std::set<proficiency_id> required_proficiencies() const;
         //

src/recipe_dictionary.cpp

@@ -184,8 +184,7 @@ std::vector<const recipe *> recipe_subset::search(
             }
 
             case search_type::proficiency:
-                return lcmatch( r->required_proficiencies_string( nullptr ), txt ) ||
-                       lcmatch( r->used_proficiencies_string( nullptr ), txt );
+                return lcmatch( r->recipe_proficiencies_string(), txt );
 
             default:
                 return false;