NPCBots: Add NpcBot.WanderingBots.SkipTarget.<NPCTYPE> config param…

…s to make wandering bots skip certain npc types when looking for attack target
trickerer · Oct 6, 2024 · 1d53be1 · 1d53be1
1 parent 78dcd83
commit 1d53be1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/src/server/game/AI/NpcBots/bot_ai.cpp b/src/server/game/AI/NpcBots/bot_ai.cpp
@@ -3689,6 +3689,14 @@ bool bot_ai::CanBotAttack(Unit const* target, int8 byspell, bool secondary) cons
     if (IsPointedNoDPSTarget(target))
         return false;
 
+    if (IsWanderer() && target->IsCreature() && target->GetVictim() != me)
+    {
+        if (BotMgr::EnableWanderingUntargetNpcQuestgiver() && target->IsQuestGiver())
+            return false;
+        if (BotMgr::EnableWanderingUntargetNpcFlightmaster() && target->IsTaxi())
+            return false;
+    }
+
     if (IAmFree())
     {
         switch (target->GetEntry())

diff --git a/src/server/game/AI/NpcBots/botmgr.cpp b/src/server/game/AI/NpcBots/botmgr.cpp
@@ -147,6 +147,8 @@ bool _enableConfigLevelCapBGFirst;
 bool _bothk_enable;
 bool _bothk_message_enable;
 bool _bothk_achievements_enable;
+bool _untarget_wnpc_questgiver;
+bool _untarget_wnpc_flightmaster;
 float _botStatLimits_dodge;
 float _botStatLimits_parry;
 float _botStatLimits_block;
@@ -419,6 +421,8 @@ void BotMgr::LoadConfig(bool reload)
     _enableclass_wander_necromancer = sConfigMgr->GetBoolDefault("NpcBot.WanderingBots.Classes.Necromancer.Enable", true);
     _enableclass_wander_seawitch    = sConfigMgr->GetBoolDefault("NpcBot.WanderingBots.Classes.SeaWitch.Enable", true);
     _enableclass_wander_cryptlord   = sConfigMgr->GetBoolDefault("NpcBot.WanderingBots.Classes.CryptLord.Enable", true);
+    _untarget_wnpc_questgiver       = sConfigMgr->GetBoolDefault("NpcBot.WanderingBots.SkipTarget.Questgiver", false);
+    _untarget_wnpc_flightmaster     = sConfigMgr->GetBoolDefault("NpcBot.WanderingBots.SkipTarget.Flightmaster", false);
     _enrageOnDismiss                = sConfigMgr->GetBoolDefault("NpcBot.EnrageOnDismiss", true);
     _botStatLimits                  = sConfigMgr->GetBoolDefault("NpcBot.Stats.Limits.Enable", false);
     _botStatLimits_dodge            = sConfigMgr->GetFloatDefault("NpcBot.Stats.Limits.Dodge", 95.0f);
@@ -855,6 +859,15 @@ bool BotMgr::IsWanderingClassEnabled(uint8 m_class)
     }
 }
 
+bool BotMgr::EnableWanderingUntargetNpcQuestgiver()
+{
+    return _untarget_wnpc_questgiver;
+}
+bool BotMgr::EnableWanderingUntargetNpcFlightmaster()
+{
+    return _untarget_wnpc_flightmaster;
+}
+
 bool BotMgr::HideBotSpawns()
 {
     return _hideSpawns;

diff --git a/src/server/game/AI/NpcBots/botmgr.h b/src/server/game/AI/NpcBots/botmgr.h
@@ -116,6 +116,8 @@ class TC_GAME_API BotMgr
         static bool TransmogUseEquipmentSlots();
         static bool IsClassEnabled(uint8 m_class);
         static bool IsWanderingClassEnabled(uint8 m_class);
+        static bool EnableWanderingUntargetNpcQuestgiver();
+        static bool EnableWanderingUntargetNpcFlightmaster();
         static bool HideBotSpawns();
         static bool IsEnrageOnDimissEnabled();
         static bool IsBotStatsLimitsEnabled();

diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
@@ -4731,6 +4731,17 @@ NpcBot.WanderingBots.Classes.Necromancer.Enable       = 1
 NpcBot.WanderingBots.Classes.SeaWitch.Enable          = 1
 NpcBot.WanderingBots.Classes.CryptLord.Enable         = 1
 
+#
+#    NpcBot.WanderingBots.SkipTarget.Questgiver
+#    NpcBot.WanderingBots.SkipTarget.Flightmaster
+#        Description: Make wandering bots skip certain npc types when selecting attack target.
+#        Note:        This option does not apply to npcs engaging the bot on their own accord.
+#        Default:     0 - (NpcBot.WanderingBots.SkipTarget.Questgiver)
+#                     0 - (NpcBot.WanderingBots.SkipTarget.Flightmaster)
+
+NpcBot.WanderingBots.SkipTarget.Questgiver   = 0
+NpcBot.WanderingBots.SkipTarget.Flightmaster = 0
+
 #
 #    NpcBot.HK.Enable
 #        Description: Count NPCBot kill at honor kill.