nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-02-03 10:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Magtheridon timer keys fix (#1936)

Browse Source 
Same deal as Karazhan--changing map id to instance id for timer keys to
prevent conflicts from multiple groups (plus other tweaks with respect
to the timers). This strategy could use a broader refactor, but that's
for another day--this PR is just to address the timer logic.
This commit is contained in:
Crow
2025-12-23 02:04:36 -06:00
committed by GitHub
parent 467b63b840
commit 895df9b197
4 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/strategy/raids/magtheridon/RaidMagtheridonActions.cpp
View File

@@ -401,14 +401,20 @@ std::unordered_map<ObjectGuid, bool> MagtheridonSpreadRangedAction::hasReachedIn
bool MagtheridonSpreadRangedAction::Execute(Event event) bool MagtheridonSpreadRangedAction::Execute(Event event)
{ {
Unit* magtheridon = AI_VALUE2(Unit*, "find target", "magtheridon");
if (!magtheridon)
return false;
Group* group = bot->GetGroup(); Group* group = bot->GetGroup();
if (!group) if (!group)
return false; return false;
const uint32 instanceId = magtheridon->GetMap()->GetInstanceId();
// Wait for 6 seconds after Magtheridon activates to spread // Wait for 6 seconds after Magtheridon activates to spread
const uint8 spreadWaitSeconds = 6; const uint8 spreadWaitSeconds = 6;
auto it = magtheridonSpreadWaitTimer.find(bot->GetMapId()); auto it = spreadWaitTimer.find(instanceId);
if (it == magtheridonSpreadWaitTimer.end() || if (it == spreadWaitTimer.end() ||
(time(nullptr) - it->second) < spreadWaitSeconds) (time(nullptr) - it->second) < spreadWaitSeconds)
return false; return false;
@@ -416,8 +422,8 @@ bool MagtheridonSpreadRangedAction::Execute(Event event)
if (cubeIt != botToCubeAssignment.end()) if (cubeIt != botToCubeAssignment.end())
{ {
time_t now = time(nullptr); time_t now = time(nullptr);
auto timerIt = magtheridonBlastNovaTimer.find(bot->GetMapId()); auto timerIt = blastNovaTimer.find(instanceId);
if (timerIt != magtheridonBlastNovaTimer.end()) if (timerIt != blastNovaTimer.end())
{ {
time_t lastBlastNova = timerIt->second; time_t lastBlastNova = timerIt->second;
if (now - lastBlastNova >= 49) if (now - lastBlastNova >= 49)
@@ -559,8 +565,8 @@ bool MagtheridonUseManticronCubeAction::HandleCubeRelease(Unit* magtheridon, Gam
bool MagtheridonUseManticronCubeAction::ShouldActivateCubeLogic(Unit* magtheridon) bool MagtheridonUseManticronCubeAction::ShouldActivateCubeLogic(Unit* magtheridon)
{ {
auto timerIt = magtheridonBlastNovaTimer.find(bot->GetMapId()); auto timerIt = blastNovaTimer.find(magtheridon->GetMap()->GetInstanceId());
if (timerIt == magtheridonBlastNovaTimer.end()) if (timerIt == blastNovaTimer.end())
return false; return false;
time_t now = time(nullptr); time_t now = time(nullptr);
@@ -650,52 +656,38 @@ bool MagtheridonManageTimersAndAssignmentsAction::Execute(Event event)
if (!magtheridon) if (!magtheridon)
return false; return false;
uint32 mapId = magtheridon->GetMapId(); const uint32 instanceId = magtheridon->GetMap()->GetInstanceId();
const time_t now = time(nullptr);
bool blastNovaActive = magtheridon->HasUnitState(UNIT_STATE_CASTING) && bool blastNovaActive = magtheridon->HasUnitState(UNIT_STATE_CASTING) &&
magtheridon->FindCurrentSpellBySpellId(SPELL_BLAST_NOVA); magtheridon->FindCurrentSpellBySpellId(SPELL_BLAST_NOVA);
bool lastBlastNova = lastBlastNovaState[mapId]; bool lastBlastNova = lastBlastNovaState[instanceId];
if (lastBlastNova && !blastNovaActive && IsMapIDTimerManager(botAI, bot)) if (lastBlastNova && !blastNovaActive && IsInstanceTimerManager(botAI, bot))
magtheridonBlastNovaTimer[mapId] = time(nullptr); blastNovaTimer[instanceId] = now;
lastBlastNovaState[mapId] = blastNovaActive;
if (IsMapIDTimerManager(botAI, bot)) lastBlastNovaState[instanceId] = blastNovaActive;
if (!magtheridon->HasAura(SPELL_SHADOW_CAGE))
{ {
if (!magtheridon->HasAura(SPELL_SHADOW_CAGE)) if (IsInstanceTimerManager(botAI, bot))
{ {
if (magtheridonSpreadWaitTimer.find(mapId) == magtheridonSpreadWaitTimer.end()) spreadWaitTimer.try_emplace(instanceId, now);
magtheridonSpreadWaitTimer[mapId] = time(nullptr); blastNovaTimer.try_emplace(instanceId, now);
dpsWaitTimer.try_emplace(instanceId, now);
if (magtheridonBlastNovaTimer.find(mapId) == magtheridonBlastNovaTimer.end())
magtheridonBlastNovaTimer[mapId] = time(nullptr);
if (magtheridonAggroWaitTimer.find(mapId) == magtheridonAggroWaitTimer.end())
magtheridonAggroWaitTimer[mapId] = time(nullptr);
} }
} }
else
if (magtheridon->HasAura(SPELL_SHADOW_CAGE))
{ {
if (!MagtheridonSpreadRangedAction::initialPositions.empty()) MagtheridonSpreadRangedAction::initialPositions.clear();
MagtheridonSpreadRangedAction::initialPositions.clear(); MagtheridonSpreadRangedAction::hasReachedInitialPosition.clear();
botToCubeAssignment.clear();
if (!MagtheridonSpreadRangedAction::hasReachedInitialPosition.empty()) if (IsInstanceTimerManager(botAI, bot))
MagtheridonSpreadRangedAction::hasReachedInitialPosition.clear();
if (!botToCubeAssignment.empty())
botToCubeAssignment.clear();
if (IsMapIDTimerManager(botAI, bot))
{ {
if (magtheridonSpreadWaitTimer.find(mapId) != magtheridonSpreadWaitTimer.end()) spreadWaitTimer.erase(instanceId);
magtheridonSpreadWaitTimer.erase(mapId); blastNovaTimer.erase(instanceId);
dpsWaitTimer.erase(instanceId);
if (magtheridonBlastNovaTimer.find(mapId) != magtheridonBlastNovaTimer.end())
magtheridonBlastNovaTimer.erase(mapId);
if (magtheridonAggroWaitTimer.find(mapId) != magtheridonAggroWaitTimer.end())
magtheridonAggroWaitTimer.erase(mapId);
} }
} }

10
src/strategy/raids/magtheridon/RaidMagtheridonHelpers.cpp
View File

@@ -170,9 +170,9 @@ namespace MagtheridonHelpers
} }
std::unordered_map<uint32, bool> lastBlastNovaState; std::unordered_map<uint32, bool> lastBlastNovaState;
std::unordered_map<uint32, time_t> magtheridonBlastNovaTimer; std::unordered_map<uint32, time_t> blastNovaTimer;
std::unordered_map<uint32, time_t> magtheridonSpreadWaitTimer; std::unordered_map<uint32, time_t> spreadWaitTimer;
std::unordered_map<uint32, time_t> magtheridonAggroWaitTimer; std::unordered_map<uint32, time_t> dpsWaitTimer;
bool IsSafeFromMagtheridonHazards(PlayerbotAI* botAI, Player* bot, float x, float y, float z) bool IsSafeFromMagtheridonHazards(PlayerbotAI* botAI, Player* bot, float x, float y, float z)
{ {
@@ -209,14 +209,14 @@ namespace MagtheridonHelpers
return true; return true;
} }
bool IsMapIDTimerManager(PlayerbotAI* botAI, Player* bot) bool IsInstanceTimerManager(PlayerbotAI* botAI, Player* bot)
{ {
if (Group* group = bot->GetGroup()) if (Group* group = bot->GetGroup())
{ {
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (member && member->IsAlive() && !botAI->IsMainTank(member) && GET_PLAYERBOT_AI(member)) if (member && member->IsAlive() && botAI->IsDps(member) && GET_PLAYERBOT_AI(member))
return member == bot; return member == bot;
} }
} }

8
src/strategy/raids/magtheridon/RaidMagtheridonHelpers.h
View File

@@ -54,7 +54,7 @@ namespace MagtheridonHelpers
void MarkTargetWithCross(Player* bot, Unit* target); void MarkTargetWithCross(Player* bot, Unit* target);
void SetRtiTarget(PlayerbotAI* botAI, const std::string& rtiName, Unit* target); void SetRtiTarget(PlayerbotAI* botAI, const std::string& rtiName, Unit* target);
bool IsSafeFromMagtheridonHazards(PlayerbotAI* botAI, Player* bot, float x, float y, float z); bool IsSafeFromMagtheridonHazards(PlayerbotAI* botAI, Player* bot, float x, float y, float z);
bool IsMapIDTimerManager(PlayerbotAI* botAI, Player* bot); bool IsInstanceTimerManager(PlayerbotAI* botAI, Player* bot);
struct Location struct Location
{ {
@@ -82,9 +82,9 @@ namespace MagtheridonHelpers
std::vector<CubeInfo> GetAllCubeInfosByDbGuids(Map* map, const std::vector<uint32>& cubeDbGuids); std::vector<CubeInfo> GetAllCubeInfosByDbGuids(Map* map, const std::vector<uint32>& cubeDbGuids);
void AssignBotsToCubesByGuidAndCoords(Group* group, const std::vector<CubeInfo>& cubes, PlayerbotAI* botAI); void AssignBotsToCubesByGuidAndCoords(Group* group, const std::vector<CubeInfo>& cubes, PlayerbotAI* botAI);
extern std::unordered_map<uint32, bool> lastBlastNovaState; extern std::unordered_map<uint32, bool> lastBlastNovaState;
extern std::unordered_map<uint32, time_t> magtheridonBlastNovaTimer; extern std::unordered_map<uint32, time_t> blastNovaTimer;
extern std::unordered_map<uint32, time_t> magtheridonSpreadWaitTimer; extern std::unordered_map<uint32, time_t> spreadWaitTimer;
extern std::unordered_map<uint32, time_t> magtheridonAggroWaitTimer; extern std::unordered_map<uint32, time_t> dpsWaitTimer;
} }
#endif #endif

8
src/strategy/raids/magtheridon/RaidMagtheridonMultipliers.cpp
View File

@@ -41,10 +41,10 @@ float MagtheridonWaitToAttackMultiplier::GetValue(Action* action)
if (!magtheridon || magtheridon->HasAura(SPELL_SHADOW_CAGE)) if (!magtheridon || magtheridon->HasAura(SPELL_SHADOW_CAGE))
return 1.0f; return 1.0f;
const uint8 aggroWaitSeconds = 6; const uint8 dpsWaitSeconds = 6;
auto it = magtheridonAggroWaitTimer.find(bot->GetMapId()); auto it = dpsWaitTimer.find(magtheridon->GetMap()->GetInstanceId());
if (it == magtheridonAggroWaitTimer.end() || if (it == dpsWaitTimer.end() ||
(time(nullptr) - it->second) < aggroWaitSeconds) (time(nullptr) - it->second) < dpsWaitSeconds)
{ {
if (!botAI->IsMainTank(bot) && (dynamic_cast<AttackAction*>(action) || if (!botAI->IsMainTank(bot) && (dynamic_cast<AttackAction*>(action) ||
(!botAI->IsHeal(bot) && dynamic_cast<CastSpellAction*>(action)))) (!botAI->IsHeal(bot) && dynamic_cast<CastSpellAction*>(action))))