[Hunter] Add a black arrow APL line for every kill shot line in Assisted Combat APL

Author: Pewtro

engine/class_modules/sc_hunter.cpp

@@ -1071,8 +1071,8 @@ struct hunter_t final : public player_t
   void init_assessors() override;
   void init_action_list() override;
   void init_blizzard_action_list() override;
-  std::string parse_assisted_combat_rule( const assisted_combat_rule_data_t& rule,
-                                          const assisted_combat_step_data_t& step ) const override;
+  std::string parse_assisted_combat_rule( const assisted_combat_rule_data_t& rule, const assisted_combat_step_data_t& step ) const override;
+  std::vector<std::string> action_names_from_spell_id( unsigned int spell_id ) const override;
   void init_special_effects() override;
   void init_finished() override;
   void reset() override;
@@ -9098,6 +9098,18 @@ std::string hunter_t::parse_assisted_combat_rule( const assisted_combat_rule_dat
   return player_t::parse_assisted_combat_rule( rule, step );
 }
 
+std::vector<std::string> hunter_t::action_names_from_spell_id( unsigned int spell_id ) const
+{
+  // We should consider making it so that we can use kill_shot to refer to both Kill Shot
+  // and Black Arrow depending on talents, rather than have them separate.
+  if( spell_id == talents.kill_shot->id() )
+  {
+    return { "kill_shot", "black_arrow" };
+  }
+
+  return player_t::action_names_from_spell_id( spell_id );
+}
+
 void hunter_t::init_special_effects()
 {
   player_t::init_special_effects();