Merge f17c968 into b5d14f3

Author: bozimmerman

src/game/Object/Player.cpp

@@ -21080,6 +21080,9 @@ void Player::SetGroup(Group* group, int8 subgroup)
         m_group.link(group, this);
         m_group.setSubGroup((uint8)subgroup);
     }
+
+    if (GetPlayerbotAI())
+        GetPlayerbotAI()->ResetStrategies();
 }
 
 /* Called by WorldSession::HandlePlayerLogin */

src/modules/Bots/playerbot/AiFactory.cpp

@@ -128,11 +128,6 @@ void AiFactory::AddDefaultCombatStrategies(Player* player, PlayerbotAI* const fa
 
     engine->addStrategies("attack weak", "racials", "chat", "default", "aoe", "potions", "cast time", "conserve mana", "duel", "pvp", NULL);
 
-    if (sPlayerbotAIConfig.cautiousDefault)
-    {
-        engine->addStrategy("cautious");
-    }
-
     switch (player->getClass())
     {
         case CLASS_PRIEST:
@@ -248,7 +243,16 @@ void AiFactory::AddDefaultCombatStrategies(Player* player, PlayerbotAI* const fa
             break;
     }
 
-    if (sRandomPlayerbotMgr.IsRandomBot(player) && !player->GetGroup())
+    if (player->GetGroup())
+    {
+        if (engine->ContainsStrategy(STRATEGY_TYPE_TANK))
+            engine->ChangeStrategy(sPlayerbotAIConfig.botTankStrategies);
+        else if (engine->ContainsStrategy(STRATEGY_TYPE_HEAL))
+            engine->ChangeStrategy(sPlayerbotAIConfig.botHealStrategies);
+        else
+            engine->ChangeStrategy(sPlayerbotAIConfig.botDpsStrategies);
+    }
+    else if (sRandomPlayerbotMgr.IsRandomBot(player))
     {
         engine->ChangeStrategy(sPlayerbotAIConfig.randomBotCombatStrategies);
     }
@@ -264,11 +268,6 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const
 {
     int tab = GetPlayerSpecTab(player);
 
-    if (sPlayerbotAIConfig.cautiousDefault)
-    {
-        nonCombatEngine->addStrategy("cautious");
-    }
-
     switch (player->getClass()){
         case CLASS_PALADIN:
         case CLASS_HUNTER:
@@ -289,7 +288,11 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const
     nonCombatEngine->addStrategies("nc", "attack weak", "food", "stay", "chat",
             "default", "quest", "loot", "gather", "duel", "emote", NULL);
 
-    if (sRandomPlayerbotMgr.IsRandomBot(player) && !player->GetGroup())
+    if (player->GetGroup())
+    {
+        nonCombatEngine->ChangeStrategy(sPlayerbotAIConfig.botGroupNonCombatStrategies);
+    }
+    else if (sRandomPlayerbotMgr.IsRandomBot(player))
     {
         nonCombatEngine->ChangeStrategy(sPlayerbotAIConfig.randomBotNonCombatStrategies);
     }

src/modules/Bots/playerbot/PlayerbotAI.cpp

@@ -1494,6 +1494,10 @@ void PlayerbotAI::WaitForSpellCast(uint32 spellId)
  */
 void PlayerbotAI::InterruptSpell()
 {
+    Spell* autoRepeat = bot->GetCurrentSpell(CURRENT_AUTOREPEAT_SPELL);
+    if (autoRepeat)
+        bot->InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
+
     if (bot->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
     {
         return;

src/modules/Bots/playerbot/PlayerbotAI.h

@@ -138,6 +138,7 @@ class PlayerbotAI : public PlayerbotAIBase
     bool ContainsStrategy(StrategyType type);
     bool HasStrategy(string name, BotState type);
     bool HasStrategy(string name) { return HasStrategy(name, currentState); }
+    BotState GetState() const { return currentState; }
     void ResetStrategies();
     void ReInitCurrentEngine();
     void Reset();

src/modules/Bots/playerbot/PlayerbotAIConfig.cpp

@@ -68,7 +68,6 @@ PlayerbotAIConfig::PlayerbotAIConfig()
       logInGroupOnly(false),
       logValuesPerTick(false),
       fleeingEnabled(false),
-      cautiousDefault(false),
       randomBotMinLevel(0),
       randomBotMaxLevel(0),
       randomChangeMultiplier(0.0f),
@@ -185,7 +184,6 @@ bool PlayerbotAIConfig::Initialize()
     logInGroupOnly = config.GetBoolDefault("AiPlayerbot.LogInGroupOnly", true);
     logValuesPerTick = config.GetBoolDefault("AiPlayerbot.LogValuesPerTick", false);
     fleeingEnabled = config.GetBoolDefault("AiPlayerbot.FleeingEnabled", true);
-    cautiousDefault = config.GetBoolDefault("AiPlayerbot.Cautious", false);
     randomBotMinLevel = config.GetIntDefault("AiPlayerbot.RandomBotMinLevel", 1);
     randomBotMaxLevel = config.GetIntDefault("AiPlayerbot.RandomBotMaxLevel", 255);
     randomBotLoginAtStartup = config.GetBoolDefault("AiPlayerbot.RandomBotLoginAtStartup", true);
@@ -196,6 +194,10 @@ bool PlayerbotAIConfig::Initialize()
 
     randomBotCombatStrategies = config.GetStringDefault("AiPlayerbot.RandomBotCombatStrategies", "+dps,+attack weak");
     randomBotNonCombatStrategies = config.GetStringDefault("AiPlayerbot.RandomBotNonCombatStrategies", "+grind,+move random,+loot");
+    botTankStrategies = config.GetStringDefault("AiPlayerbot.BotTankStrategies", "+tank aoe");
+    botDpsStrategies = config.GetStringDefault("AiPlayerbot.BotDpsStrategies", "+dps assist");
+    botHealStrategies = config.GetStringDefault("AiPlayerbot.BotHealStrategies", "");
+    botGroupNonCombatStrategies = config.GetStringDefault("AiPlayerbot.BotGroupNonCombatStrategies", "+follow master,+loot");
 
     commandPrefix = config.GetStringDefault("AiPlayerbot.CommandPrefix", "");
 

src/modules/Bots/playerbot/PlayerbotAIConfig.h

@@ -72,8 +72,8 @@ class PlayerbotAIConfig
     uint32 randomBotTeleLevel; ///< The teleport level for random bots.
     bool logInGroupOnly, logValuesPerTick;
     bool fleeingEnabled; ///< Indicates if fleeing is enabled for bots.
-    bool cautiousDefault;
     std::string randomBotCombatStrategies, randomBotNonCombatStrategies;
+    std::string botTankStrategies, botDpsStrategies, botHealStrategies, botGroupNonCombatStrategies;
     uint32 randomBotMinLevel, randomBotMaxLevel;
     float randomChangeMultiplier;
     uint32 specProbability[MAX_CLASSES][3]; ///< Probability of class specs for random bots.

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

@@ -88,9 +88,6 @@ AiPlayerbot.CommandPrefix = ~
 # Bot can flee for enemy
 #AiPlayerbot.FleeingEnabled = 1
 
-# Bot avoids pulling aggro during movement by default
-#AiPlayerbot.Cautious = 0
-
 # Health/Mana levels
 #AiPlayerbot.CriticalHealth = 25
 #AiPlayerbot.LowHealth = 45
@@ -108,6 +105,12 @@ AiPlayerbot.CommandPrefix = ~
 #AiPlayerbot.RandomBotCombatStrategies = +dps,+attack weak
 #AiPlayerbot.RandomBotNonCombatStrategies = +grind,+move random,+loot
 
+# Group strategies (applied by role to all bots when in a group, replacing solo strategies)
+#AiPlayerbot.BotTankStrategies = +tank aoe
+#AiPlayerbot.BotDpsStrategies = +dps assist
+#AiPlayerbot.BotHealStrategies =
+#AiPlayerbot.BotGroupNonCombatStrategies = +follow master,+loot
+
 # Create random bot characters automatically
 #AiPlayerbot.RandomBotAutoCreate = 1
 

src/modules/Bots/playerbot/strategy/Engine.cpp

@@ -581,8 +581,6 @@ void Engine::LogAction(const char* format, ...)
         {
             return;
         }
-
-        sLog.outDebug("%s %s", bot->GetName(), buf);
     }
 }
 
@@ -592,6 +590,8 @@ void Engine::ChangeStrategy(string &names)
     vector<string> splitted = split(names, ',');
     for (vector<string>::iterator i = splitted.begin(); i != splitted.end(); i++)
     {
+        i->erase(0, i->find_first_not_of(" \t"));
+        i->erase(i->find_last_not_of(" \t") + 1);
         const char* name = i->c_str();
         switch (name[0])
         {

src/modules/Bots/playerbot/strategy/warlock/TankWarlockStrategy.h

@@ -9,6 +9,7 @@ namespace ai
     public:
         TankWarlockStrategy(PlayerbotAI* ai);
         virtual string getName() { return "tank"; }
+        virtual int GetType() { return STRATEGY_TYPE_TANK | STRATEGY_TYPE_RANGED; }
 
     public:
         virtual void InitTriggers(std::list<TriggerNode*> &triggers);