-Mount fix: Bots now use a random mount or mountspell of the highest …

…speed available.
conan513 · May 9, 2023 · b5a38c8 · b5a38c8
1 parent df7a440
commit b5a38c8
Show file tree

Hide file tree

Showing 10 changed files with 381 additions and 265 deletions.
diff --git a/playerbot/ChatHelper.h b/playerbot/ChatHelper.h
@@ -34,6 +34,7 @@ namespace ai
         static uint32 parseSlot(string text);
 
         static string formatSpell(SpellEntry const *sInfo);
+        static string formatSpell(uint32 spellId) {const SpellEntry* const spellInfo = sSpellTemplate.LookupEntry<SpellEntry>(spellId); if (!spellInfo) return ""; return formatSpell(spellInfo);};
         uint32 parseSpell(string& text);
 
         static string formatGameobject(GameObject* go);

diff --git a/playerbot/strategy/ItemVisitors.h b/playerbot/strategy/ItemVisitors.h
@@ -332,6 +332,9 @@ namespace ai
         {
             for (int j = 0; j < MAX_ITEM_PROTO_SPELLS; j++)
             {
+                if (proto->Spells[j].SpellId == 26656)
+                    return true;
+
                 const SpellEntry* const spellInfo = sServerFacade.LookupSpellInfo(proto->Spells[j].SpellId);
                 if (!spellInfo)
                     return false;

diff --git a/playerbot/strategy/actions/CastCustomSpellAction.cpp b/playerbot/strategy/actions/CastCustomSpellAction.cpp
@@ -126,7 +126,7 @@ bool CastCustomSpellAction::Execute(Event& event)
         ai->StopMoving();
     }
 
-    if (CheckMountStateAction::CurrentMountSpeed(bot))
+    if (AI_VALUE2(uint32, "current mount speed", "self target"))
     {
         if (bot->IsFlying() && WorldPosition(bot).currentHeight() > 10.0f)
             return false;