[Player] enable_all_sets only enables hero sets available to the spec

Author: gastank

engine/dbc/trait_data.cpp

@@ -6,6 +6,7 @@
 
 #include "config.hpp"
 
+#include "dbc/dbc.hpp"
 #include "util/util.hpp"
 
 #include "trait_data.hpp"
@@ -260,6 +261,30 @@ bool trait_data_t::is_granted( const trait_data_t* trait, player_e type, special
   return false;
 }
 
+std::vector<unsigned> trait_data_t::get_valid_hero_tree_ids( specialization_e spec, bool ptr )
+{
+  auto class_id = util::class_id( dbc::get_class_from_spec( spec ) );
+  auto _data = data( class_id, talent_tree::SELECTION, ptr );
+
+  std::vector<unsigned> id_list;
+
+  for ( const auto& entry : _data )
+  {
+    for ( const auto& spec_entry : entry.id_spec )
+    {
+      if ( spec_entry == static_cast<unsigned>( spec ) )
+      {
+        id_list.push_back( entry.id_sub_tree );
+      }
+    }
+  }
+
+  auto it = range::unique( id_list );
+  id_list.erase( it, id_list.end() );
+
+  return id_list;
+}
+
 util::span<const trait_definition_effect_entry_t> trait_definition_effect_entry_t::data( bool ptr )
 {
   return SC_DBC_GET_DATA( __trait_definition_effect_data, __ptr_trait_definition_effect_data, ptr );

engine/dbc/trait_data.hpp

@@ -47,6 +47,7 @@ struct trait_data_t
   static bool is_hero_trait_available( const trait_data_t* trait, player_e type, specialization_e spec,
                                        bool ptr = false );
   static bool is_granted( const trait_data_t* trait, player_e type, specialization_e spec, bool ptr = false );
+  static std::vector<unsigned> get_valid_hero_tree_ids( specialization_e spec, bool ptr = false );
   static util::span<const trait_data_t> data( bool ptr = false );
   static util::span<const trait_data_t> data( talent_tree tree, bool ptr = false );
   static util::span<const trait_data_t> data( unsigned class_id, talent_tree tree, bool ptr = false );

engine/player/set_bonus.cpp

@@ -286,16 +286,17 @@ void set_bonus_t::initialize()
 void set_bonus_t::enable_all_sets()
 {
   auto set_bonuses = item_set_bonus_t::data( actor->dbc->ptr );
+  auto hero_tree_ids = trait_data_t::get_valid_hero_tree_ids( actor->_spec, actor->dbc->ptr );
 
-  // assume class & spec matching bonuses are tier
-  // or actor has the correct trait_sub_tree
+  // assume class & spec matching bonuses are tier or hero tree is available to spec
   for ( const auto& bonus : set_bonuses )
   {
     bool has_class = bonus.class_id == -1 || bonus.class_id == util::class_id( actor->type );
     bool has_spec  = bonus.spec == -1 || bonus.spec == static_cast<int>( actor->_spec );
-    bool has_trait_sub_tree = bonus.trait_sub_tree == -1 ? true : range::contains( actor->player_sub_trees, as<unsigned>( bonus.trait_sub_tree ) );
+    bool has_trait_sub_tree =
+      bonus.trait_sub_tree == -1 || range::contains( hero_tree_ids, as<unsigned>( bonus.trait_sub_tree ) );
 
-    if ( has_class && ( has_spec || has_trait_sub_tree ) )
+    if ( has_class && has_spec && has_trait_sub_tree )
     {
       set_bonus_spec_data[ bonus.enum_id ][ composite_idx( bonus, actor ) ][ bonus.bonus - 1 ].overridden = 1;
     }

engine/report/report_html_player.cpp

@@ -3913,7 +3913,7 @@ void print_html_player_results_spec_gear( report::sc_html_stream& os, const play
       {
         int curr_tier = set_bonus_type_e::SET_BONUS_NONE;
 
-        os << "<tr class=\"left\"><th>Set Bonus</th><td><ul class=\"float\">\n";
+        os << "<tr class=\"left nowrap\"><th>Set Bonus</th><td><ul class=\"float\">\n";
 
         for ( auto bonus : bonuses )
         {