Merge pull request mod-playerbots#2467 from mod-playerbots/test-staging

Merge test-staging into master

Author: Celandriel

src/Ai/Base/Actions/CheckMountStateAction.cpp

@@ -17,6 +17,7 @@
 #include "SpellAuraEffects.h"
 
 static constexpr uint32 SPELL_COLD_WEATHER_FLYING = 54197;
+static constexpr float PARACHUTE_LAND_THRESHOLD = 15.0f;
 
 // Define the static map / init bool for caching bot preferred mount data globally
 std::unordered_map<uint32, PreferredMountCache> CheckMountStateAction::mountCache;
@@ -61,6 +62,21 @@ MountData CollectMountData(const Player* bot)
 
 bool CheckMountStateAction::Execute(Event /*event*/)
 {
+    // Forced flight dismount:
+    // Bots get stale flight movement flags after a forced dismount (e.g: Dalaran) because the post landing dismount cleanup
+    // needs MSG_MOVE_FALL_LAND (a client opcode) and client movement packets. The stale flags cause the bot to be stuck with
+    // the parachute, or even keep the bot hovering indefinitely and block MMAP routing.
+    // Note: Without MSG_MOVE_FALL_LAND, HandleFall doesn't trigger, meaning bots don't get fall damage in forced dismounts anyway,
+    // so the parachute usage here is more of an immersion feature.
+    if (bot->HasFeatherFallAura())
+    {
+        float floorZ = bot->GetMapHeight(bot->GetPositionX(), bot->GetPositionY(), bot->GetPositionZ());
+        if (floorZ != INVALID_HEIGHT && floorZ != VMAP_INVALID_HEIGHT_VALUE &&
+            bot->GetPositionZ() - floorZ <= PARACHUTE_LAND_THRESHOLD)
+            bot->RemoveAurasByType(SPELL_AURA_FEATHER_FALL);
+    }
+    ClearStaleFlightFlags();
+
     // Determine if there are no attackers
     bool noAttackers = !AI_VALUE2(bool, "combat", "self target") || !AI_VALUE(uint8, "attacker count");
     bool enemy = AI_VALUE(Unit*, "enemy player target");
@@ -204,7 +220,7 @@ bool CheckMountStateAction::Mount()
     // Get bot mount data
     MountData mountData = CollectMountData(bot);
     int32 masterMountType = GetMountType(master);
-    int32 masterSpeed = CalculateMasterMountSpeed(master, mountData);
+    int32 masterSpeed = CalculateMasterMountSpeed(master);
 
     // Try shapeshift
     if (TryForms(master, masterMountType, masterSpeed))
@@ -234,14 +250,17 @@ void CheckMountStateAction::Dismount()
     WorldPacket emptyPacket;
     bot->GetSession()->HandleCancelMountAuraOpcode(emptyPacket);
 
-    bool const wantsFly = bot->HasIncreaseMountedFlightSpeedAura() || bot->HasFlyAura();
-    bool const isWaterWalking = bot->HasUnitMovementFlag(MOVEMENTFLAG_WATERWALKING);
-    bool const isFlying = bot->HasUnitMovementFlag(MOVEMENTFLAG_FLYING);
-    bool const hasGravityDisabled = bot->HasUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
-    if (!wantsFly && !isWaterWalking && (isFlying || hasGravityDisabled))
+    ClearStaleFlightFlags();
+}
+
+void CheckMountStateAction::ClearStaleFlightFlags()
+{
+    if (bot->HasIncreaseMountedFlightSpeedAura() || bot->HasFlyAura())
+        return;
+
+    if (bot->HasUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_DISABLE_GRAVITY))
     {
-        bot->RemoveUnitMovementFlag(
-            MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_DISABLE_GRAVITY);
+        bot->RemoveUnitMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_CAN_FLY);
         if (!bot->IsRooted())
             bot->SendMovementFlagUpdate();
     }
@@ -490,7 +509,7 @@ static bool BotCanUseFlyingMount(Player const* bot)
     return true;
 }
 
-int32 CheckMountStateAction::CalculateMasterMountSpeed(Player* master, const MountData& mountData) const
+int32 CheckMountStateAction::CalculateMasterMountSpeed(Player* master) const
 {
     // Check riding skill and level requirements
     int32 ridingSkill = bot->GetPureSkillValue(SKILL_RIDING);

src/Ai/Base/Actions/CheckMountStateAction.h

@@ -53,9 +53,10 @@ class CheckMountStateAction : public UseItemAction
     float CalculateDismountDistance() const;
     float CalculateMountDistance() const;
     void Dismount();
+    void ClearStaleFlightFlags();
     bool ShouldFollowMasterMountState(Player* master, bool noAttackers, bool shouldMount) const;
     bool ShouldDismountForMaster(Player* master) const;
-    int32 CalculateMasterMountSpeed(Player* master, const MountData& mountData) const;
+    int32 CalculateMasterMountSpeed(Player* master) const;
     bool CheckForSwiftMount() const;
     std::map<uint32, std::map<int32, std::vector<uint32>>> GetAllMountSpells() const;
     bool TryForms(Player* master, int32 masterMountType, int32 masterSpeed) const;

src/Ai/Base/Actions/TameAction.cpp

@@ -422,10 +422,9 @@ bool TameAction::RenamePet(const std::string& newName)
 
     // Remove the current pet and (re-)cast Call Pet spell if the bot is a hunter
     bot->RemovePet(nullptr, PET_SAVE_AS_CURRENT, true);
-    if (bot->getClass() == CLASS_HUNTER && bot->HasSpell(883))
-    {
-        bot->CastSpell(bot, 883, true);
-    }
+    constexpr uint32 SPELL_CALL_PET = 883;
+    if (bot->getClass() == CLASS_HUNTER && bot->HasSpell(SPELL_CALL_PET))
+        bot->CastSpell(bot, SPELL_CALL_PET, true);
 
     return true;
 }

src/Ai/Base/Actions/TradeStatusExtendedAction.cpp

@@ -67,9 +67,10 @@ bool TradeStatusExtendedAction::Execute(Event event)
                 return false;
             }
 
-            if (bot->getClass() == CLASS_ROGUE && bot->HasSpell(1804) && lockbox->IsLocked()) // Pick Lock spell
+            constexpr uint32 SPELL_PICK_LOCK = 1804;
+            if (bot->getClass() == CLASS_ROGUE && bot->HasSpell(SPELL_PICK_LOCK) && lockbox->IsLocked())
             {
-                // botAI->CastSpell(1804, bot, lockbox); // Attempt to cast Pick Lock on the lockbox
+                // botAI->CastSpell(SPELL_PICK_LOCK, bot, lockbox); // Attempt to cast Pick Lock on the lockbox
                 botAI->DoSpecificAction("unlock traded item");
                 botAI->SetNextCheckDelay(4000); // Delay before accepting trade
             }

src/Ai/Base/Trigger/BossAuraTriggers.cpp

@@ -23,9 +23,7 @@ bool BossFireResistanceTrigger::IsActive()
         return false;
 
     // Check if bot have fire resistance aura
-    if (bot->HasAura(SPELL_FIRE_RESISTANCE_AURA_RANK_5) || bot->HasAura(SPELL_FIRE_RESISTANCE_AURA_RANK_4) ||
-        bot->HasAura(SPELL_FIRE_RESISTANCE_AURA_RANK_3) || bot->HasAura(SPELL_FIRE_RESISTANCE_AURA_RANK_2) ||
-        bot->HasAura(SPELL_FIRE_RESISTANCE_AURA_RANK_1))
+    if (botAI->HasAura("fire resistance aura", bot))
         return false;
 
     // Check if bot dont have already have fire resistance strategy
@@ -76,9 +74,7 @@ bool BossFrostResistanceTrigger::IsActive()
         return false;
 
     // Check if bot have frost resistance aura
-    if (bot->HasAura(SPELL_FROST_RESISTANCE_AURA_RANK_5) || bot->HasAura(SPELL_FROST_RESISTANCE_AURA_RANK_4) ||
-        bot->HasAura(SPELL_FROST_RESISTANCE_AURA_RANK_3) || bot->HasAura(SPELL_FROST_RESISTANCE_AURA_RANK_2) ||
-        bot->HasAura(SPELL_FROST_RESISTANCE_AURA_RANK_1))
+    if (botAI->HasAura("frost resistance aura", bot))
         return false;
 
     // Check if bot dont have already have frost resistance strategy
@@ -133,8 +129,7 @@ bool BossNatureResistanceTrigger::IsActive()
         return false;
 
     // Check if bot have nature resistance aura
-    if (bot->HasAura(SPELL_ASPECT_OF_THE_WILD_RANK_4) || bot->HasAura(SPELL_ASPECT_OF_THE_WILD_RANK_3) ||
-        bot->HasAura(SPELL_ASPECT_OF_THE_WILD_RANK_2) || bot->HasAura(SPELL_ASPECT_OF_THE_WILD_RANK_1))
+    if (botAI->HasAura("aspect of the wild", bot))
         return false;
 
     // Check if bot dont have already setted nature resistance aura
@@ -184,11 +179,7 @@ bool BossShadowResistanceTrigger::IsActive()
         return false;
 
     // Check if bot have shadow resistance aura
-    if (bot->HasAura(SPELL_SHADOW_RESISTANCE_AURA_RANK_5) ||
-        bot->HasAura(SPELL_SHADOW_RESISTANCE_AURA_RANK_4) ||
-        bot->HasAura(SPELL_SHADOW_RESISTANCE_AURA_RANK_3) ||
-        bot->HasAura(SPELL_SHADOW_RESISTANCE_AURA_RANK_2) ||
-        bot->HasAura(SPELL_SHADOW_RESISTANCE_AURA_RANK_1))
+    if (botAI->HasAura("shadow resistance aura", bot))
         return false;
 
     // Check if bot dont have already have shadow resistance strategy

src/Ai/Class/Dk/Strategy/DeathKnightPullStrategy.cpp

@@ -5,38 +5,26 @@
 
 #include "DeathKnightPullStrategy.h"
 
-#include "AiObjectContext.h"
 #include "Player.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
 
 std::string DeathKnightPullStrategy::GetPullActionName() const
 {
-    Player* bot = botAI->GetBot();
     Unit* target = GetTarget();
-    if (!bot || !target ||
+    if (!target ||
         (!botAI->HasStrategy("blood", BOT_STATE_COMBAT) && !botAI->HasStrategy("blood", BOT_STATE_NON_COMBAT)))
     {
         return PullStrategy::GetPullActionName();
     }
 
-    uint32 const deathGripSpellId = botAI->GetAiObjectContext()->GetValue<uint32>("spell id", "death grip")->Get();
-    if (deathGripSpellId && bot->HasSpell(deathGripSpellId) &&
-        botAI->CanCastSpell(deathGripSpellId, target))
-    {
+    if (botAI->CanCastSpell("death grip", target))
         return "death grip";
-    }
 
-    uint32 const icyTouchSpellId = botAI->GetAiObjectContext()->GetValue<uint32>("spell id", "icy touch")->Get();
-    if (!icyTouchSpellId || !bot->HasSpell(icyTouchSpellId) ||
-        !botAI->CanCastSpell(icyTouchSpellId, target))
+    if (!botAI->CanCastSpell("icy touch", target) &&
+        botAI->CanCastSpell("dark command", target))
     {
-        uint32 const darkCommandSpellId = botAI->GetAiObjectContext()->GetValue<uint32>("spell id", "dark command")->Get();
-        if (darkCommandSpellId && bot->HasSpell(darkCommandSpellId) &&
-            botAI->CanCastSpell(darkCommandSpellId, target))
-        {
-            return "dark command";
-        }
+        return "dark command";
     }
 
     return PullStrategy::GetPullActionName();

src/Ai/Class/Druid/Action/DruidShapeshiftActions.cpp

@@ -50,9 +50,10 @@ bool CastCancelDruidAction::Execute(Event /*event*/)
     return true;
 }
 
-bool CastCancelDruidAction::isUseful() { return botAI->HasAura(auraId, bot); }
+bool CastCancelDruidAction::isUseful() { return bot->HasAura(auraId); }
 
 bool CastTreeFormAction::isUseful()
 {
-    return GetTarget() && CastSpellAction::isUseful() && !botAI->HasAura(33891, bot);
+    constexpr uint32 SPELL_TREE_OF_LIFE = 33891;
+    return GetTarget() && CastSpellAction::isUseful() && !bot->HasAura(SPELL_TREE_OF_LIFE);
 }

src/Ai/Class/Druid/DruidTriggers.cpp

@@ -28,7 +28,11 @@ bool ThornsTrigger::IsActive() { return BuffTrigger::IsActive() && !botAI->HasAu
 
 bool BearFormTrigger::IsActive() { return !botAI->HasAnyAuraOf(bot, "bear form", "dire bear form", nullptr); }
 
-bool TreeFormTrigger::IsActive() { return !botAI->HasAura(33891, bot); }
+bool TreeFormTrigger::IsActive()
+{
+    constexpr uint32 SPELL_TREE_OF_LIFE = 33891;
+    return !bot->HasAura(SPELL_TREE_OF_LIFE);
+}
 
 bool CatFormTrigger::IsActive() { return !botAI->HasAura("cat form", bot); }
 
@@ -43,8 +47,11 @@ bool ProwlTrigger::IsActive()
     if (botAI->HasAura("prowl", bot) || bot->IsInCombat())
         return false;
 
-    uint32 prowlId = botAI->GetAiObjectContext()->GetValue<uint32>("spell id", "prowl")->Get();
-    if (!prowlId || !bot->HasSpell(prowlId) || bot->HasSpellCooldown(prowlId))
+    if (!botAI->HasSpell("prowl"))
+        return false;
+
+    uint32 const prowlId = AI_VALUE2(uint32, "spell id", "prowl");
+    if (bot->HasSpellCooldown(prowlId))
         return false;
 
     float distance = 30.f;

src/Ai/Class/Druid/DruidTriggers.h

@@ -393,14 +393,14 @@ class FerociousBiteTimeTrigger : public Trigger
 class FerociousBiteExecuteTrigger : public Trigger
 {
 public:
-    FerociousBiteExecuteTrigger(PlayerbotAI* ai) : Trigger(ai, "ferocious bite execute") {}
+    FerociousBiteExecuteTrigger(PlayerbotAI* botAI) : Trigger(botAI, "ferocious bite execute") {}
     bool IsActive() override
     {
         Unit* target = AI_VALUE(Unit*, "current target");
         if (!target || !target->IsAlive())
             return false;
 
-        if (!AI_VALUE2(uint32, "spell id", "ferocious bite"))
+        if (!botAI->HasSpell("ferocious bite"))
             return false;
 
         if (AI_VALUE2(uint8, "combo", "current target") < 1)

src/Ai/Class/Druid/Strategy/DruidPullStrategy.cpp

@@ -5,34 +5,23 @@
 
 #include "DruidPullStrategy.h"
 
-#include "AiObjectContext.h"
-#include "Player.h"
 #include "PlayerbotAI.h"
 #include "Playerbots.h"
 
 std::string DruidPullStrategy::GetPullActionName() const
 {
-    Player* bot = botAI->GetBot();
-    std::string actionName = PullStrategy::GetPullActionName();
-    if (!bot)
-        return actionName;
-
-    uint32 const faerieFireFeralId = botAI->GetAiObjectContext()->GetValue<uint32>("spell id", "faerie fire (feral)")->Get();
-    if (faerieFireFeralId && bot->HasSpell(faerieFireFeralId) &&
-        (botAI->HasStrategy("bear", BOT_STATE_COMBAT) || botAI->HasStrategy("cat", BOT_STATE_COMBAT)))
-    {
-        actionName = "faerie fire (feral)";
-    }
+    std::string const pullActionName = PullStrategy::GetPullActionName();
+    std::string const actionName =
+        botAI->HasSpell("faerie fire (feral)") &&
+            (botAI->HasStrategy("bear", BOT_STATE_COMBAT) || botAI->HasStrategy("cat", BOT_STATE_COMBAT))
+            ? "faerie fire (feral)" : pullActionName;
 
     Unit* target = GetTarget();
-    uint32 const faerieFireSpellId = botAI->GetAiObjectContext()->GetValue<uint32>("spell id", actionName)->Get();
-    if (target && (!faerieFireSpellId || !bot->HasSpell(faerieFireSpellId) ||
-        !botAI->CanCastSpell(faerieFireSpellId, target)))
-    {
-        uint32 const growlSpellId = botAI->GetAiObjectContext()->GetValue<uint32>("spell id", "growl")->Get();
-        if (growlSpellId && bot->HasSpell(growlSpellId) && botAI->CanCastSpell(growlSpellId, target))
-            return "growl";
-    }
+    if (!target)
+        return actionName;
+
+    if (!botAI->CanCastSpell(actionName, target) && botAI->CanCastSpell("growl", target))
+        return "growl";
 
     return actionName;
 }