Merge 63ae8d7 into da52a27

Author: bozimmerman

src/modules/Bots/playerbot/PlayerbotAIConfig.cpp

@@ -31,6 +31,7 @@ PlayerbotAIConfig::PlayerbotAIConfig()
       followDistance(0.0f),
       whisperDistance(0.0f),
       contactDistance(0.0f),
+      whisperToZoneOnly(false),
       criticalHealth(0),
       lowHealth(0),
       mediumHealth(0),
@@ -134,6 +135,7 @@ bool PlayerbotAIConfig::Initialize()
     meleeDistance = config.GetFloatDefault("AiPlayerbot.MeleeDistance", 1.5f);
     followDistance = config.GetFloatDefault("AiPlayerbot.FollowDistance", 1.5f);
     whisperDistance = config.GetFloatDefault("AiPlayerbot.WhisperDistance", 6000.0f);
+    whisperToZoneOnly = config.GetBoolDefault("AiPlayerbot.WhisperToZoneOnly", false);
     contactDistance = config.GetFloatDefault("AiPlayerbot.ContactDistance", 0.5f);
 
     criticalHealth = config.GetIntDefault("AiPlayerbot.CriticalHealth", 20);

src/modules/Bots/playerbot/PlayerbotAIConfig.h

@@ -45,6 +45,7 @@ class PlayerbotAIConfig
     uint32 globalCoolDown, reactDelay, maxWaitForMove, passiveDelay;
     float sightDistance, spellDistance, reactDistance, grindDistance, lootDistance,
         fleeDistance, tooCloseDistance, meleeDistance, followDistance, whisperDistance, contactDistance;
+    bool whisperToZoneOnly;
     uint32 criticalHealth, lowHealth, mediumHealth, almostFullHealth;
     uint32 lowMana, mediumMana;
 

src/modules/Bots/playerbot/aiplayerbot.conf.dist.in

@@ -81,6 +81,8 @@ AiPlayerbot.CommandPrefix = ~
 #AiPlayerbot.MeleeDistance = 1.0
 #AiPlayerbot.FollowDistance = 1.5
 #AiPlayerbot.WhisperDistance = 6000.0
+# If enabled, bot suggestion whispers will only target players in the same zone
+#AiPlayerbot.WhisperToZoneOnly = false
 #AiPlayerbot.ContactDistance = 0.5
 
 # Bot can flee for enemy

src/modules/Bots/playerbot/strategy/actions/SuggestWhatToDoAction.cpp

@@ -278,6 +278,9 @@ void SuggestWhatToDoAction::spam(string msg)
         return;
     }
 
+    if (sPlayerbotAIConfig.whisperToZoneOnly && bot->GetZoneId() != player->GetZoneId())
+        return;
+
     if (sPlayerbotAIConfig.whisperDistance && !bot->GetGroup() && sRandomPlayerbotMgr.IsRandomBot(bot) &&
             player->GetSession()->GetSecurity() < SEC_GAMEMASTER &&
             (bot->GetMapId() != player->GetMapId() || bot->GetDistance(player) > sPlayerbotAIConfig.whisperDistance))