Generalized Profileset Control

engine/class_modules/monk/sc_monk.cpp

@@ -36,6 +36,7 @@
 #include "report/charts.hpp"
 #include "report/highchart.hpp"
 #include "sc_enums.hpp"
+#include "sim/profileset_control.hpp"
 
 #include <deque>
 
@@ -4346,7 +4347,7 @@ struct xuen_spell_t : public monk_spell_t
 
     cast_during_sck = true;
     // Specifically set for 10.1 class trinket
-    harmful  = true;
+    harmful = true;
   }
 
   void execute() override
@@ -4577,7 +4578,7 @@ struct niuzao_spell_t : public monk_spell_t
     // Specifically set for 10.1 class trinket
     harmful = true;
     // Forcing the minimum GCD to 750 milliseconds
-    min_gcd  = timespan_t::from_millis( 750 );
+    min_gcd = timespan_t::from_millis( 750 );
 
     apply_affecting_aura( p->talent.brewmaster.walk_with_the_ox );
   }
@@ -4630,7 +4631,7 @@ struct chiji_spell_t : public monk_spell_t
     // Specifically set for 10.1 class trinket
     harmful = true;
     // Forcing the minimum GCD to 750 milliseconds
-    min_gcd  = timespan_t::from_millis( 750 );
+    min_gcd = timespan_t::from_millis( 750 );
   }
 
   void execute() override
@@ -4659,7 +4660,7 @@ struct yulon_spell_t : public monk_spell_t
     // Specifically set for 10.1 class trinket
     harmful = true;
     // Forcing the minimum GCD to 750 milliseconds
-    min_gcd  = timespan_t::from_millis( 750 );
+    min_gcd = timespan_t::from_millis( 750 );
   }
 
   void execute() override

engine/class_modules/monk/sc_monk.hpp

@@ -16,6 +16,7 @@
 #include "sc_enums.hpp"
 #include "sc_stagger.hpp"
 #include "sim/proc.hpp"
+#include "sim/profileset_control.hpp"
 #include "util/timeline.hpp"
 
 #include <array>

engine/report/json/report_json.cpp

@@ -1279,6 +1279,7 @@ void to_json( const ::report::json::report_configuration_t& report_configuration
   {
     auto profileset_root = root[ "profilesets" ];
     profileset_json( report_configuration, *sim.profilesets, sim, profileset_root );
+    profileset_controller::report_json( sim, root );
   }
 
   if ( !sim.plot->dps_plot_stats.empty() )

engine/report/report_html_sim.cpp

@@ -1160,6 +1160,8 @@ void print_profilesets( std::ostream& out, const profileset::profilesets_t& prof
 
   print_profilesets_chart( out, sim );
 
+  profileset_controller::report_html( sim, out );
+
   out << "</div>";
   out << "</div>";
 }