[monk] Fixes and bug implementations for SEF TP, Hit Combo, Against All Odds.

engine/class_modules/monk/sc_monk.cpp

@@ -6651,7 +6651,7 @@ monk_td_t::monk_td_t( player_t *target, monk_t *p ) : actor_target_data_t( targe
       make_buff( *this, "gale_force", p->find_spell( 451582 ) )->set_trigger_spell( p->talent.windwalker.gale_force );
 
   debuff.mark_of_the_crane = make_buff( *this, "mark_of_the_crane", p->passives.mark_of_the_crane )
-                                 ->set_stack_change_callback( [ p ]( buff_t *debuff, int old_, int new_ ) {
+                                 ->set_stack_change_callback( [ p ]( buff_t *, int, int new_ ) {
                                    if ( p->user_options.motc_override == 0 )
                                    {
                                      if ( new_ )
@@ -6819,6 +6819,7 @@ void monk_t::parse_player_effects()
   // windwalker player auras
   parse_effects( baseline.windwalker.aura );
   parse_effects( baseline.windwalker.aura_2 );
+  parse_effects( buff.hit_combo, effect_mask_t( true ).disable( 4 ) );
 
   // class talent auras
   parse_effects( talent.monk.grace_of_the_crane );
@@ -6846,7 +6847,7 @@ void monk_t::parse_player_effects()
 
   // Shadopan
   parse_effects( buff.wisdom_of_the_wall_mastery );
-  // parse_effects( buff.against_all_odds );
+  parse_effects( buff.against_all_odds );
   parse_effects( buff.veterans_eye );
 
   // Conduit of the Celestials
@@ -8313,8 +8314,7 @@ void monk_t::create_buffs()
                                                                  "fury_of_xuen", passives.fury_of_xuen );
 
   buff.hit_combo = make_buff_fallback( talent.windwalker.hit_combo->ok(), this, "hit_combo", passives.hit_combo )
-                       ->set_default_value_from_effect( 1 )
-                       ->add_invalidate( CACHE_PLAYER_DAMAGE_MULTIPLIER );
+                       ->set_default_value_from_effect( 1 );
 
   buff.flurry_of_xuen = make_buff_fallback( talent.windwalker.flurry_of_xuen->ok(), this, "flurry_of_xuen",
                                             passives.flurry_of_xuen_driver )
@@ -8539,10 +8539,7 @@ void monk_t::create_buffs()
   buff.against_all_odds =
       make_buff_fallback( talent.shado_pan.against_all_odds->ok(), this, "against_all_odds", find_spell( 451061 ) )
           ->set_default_value_from_effect( 1 )
-          //          ->set_default_value_from_effect_type(
-          //              A_MOD_PERCENT_STAT )  // bugged should be A_MOD_TOTAL_STAT_PERCENTAGE (137)
-          ->set_pct_buff_type( STAT_PCT_BUFF_AGILITY )
-          ->add_invalidate( CACHE_AGILITY );
+          ->set_trigger_spell( talent.shado_pan.against_all_odds );
 
   buff.flurry_charge =
       make_buff_fallback( talent.shado_pan.flurry_strikes->ok(), this, "flurry_charge", find_spell( 451021 ) )
@@ -9235,19 +9232,6 @@ double monk_t::composite_attack_power_multiplier() const
   return ap;
 }
 
-// monk_t::composite_attribute() ==========================
-
-double monk_t::composite_attribute( attribute_e attr ) const
-{
-  auto a = player_t::composite_attribute( attr );
-
-  // TODO: remove if fixed
-  //  if ( attr == ATTR_AGILITY && buff.against_all_odds->check() )
-  //    a += base.stats.attribute[ attr ] * buff.against_all_odds->check_value();
-
-  return a;
-}
-
 // monk_t::composite_dodge ==============================================
 
 double monk_t::composite_dodge() const

engine/class_modules/monk/sc_monk.hpp

@@ -1437,7 +1437,6 @@ struct monk_t : public stagger_t<parse_player_effects_t, monk_t>
   std::string default_temporary_enchant() const override;
   action_t *create_action( util::string_view name, util::string_view options ) override;
   double composite_attack_power_multiplier() const override;
-  double composite_attribute( attribute_e ) const override;
   double composite_dodge() const override;
   double non_stacking_movement_modifier() const override;
   double composite_player_target_armor( player_t *target ) const override;

engine/class_modules/monk/sc_monk_pets.cpp

@@ -710,6 +710,16 @@ struct storm_earth_and_fire_pet_t : public monk_pet_t
     {
     }
 
+    double action_multiplier() const override
+    {
+      double am = sef_melee_attack_t::action_multiplier();
+
+      if ( p()->o()->buff.tigers_ferocity->check() )
+        am /= 1.0 + p()->o()->buff.tigers_ferocity->check_stack_value();
+
+      return am;
+    }
+
     void impact( action_state_t *state ) override
     {
       sef_melee_attack_t::impact( state );