yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1651 from Tierisch/shaman_fix

Browse Source 
Fix SetTotemAction - add `isUseful` and get array size instead of pointer size
This commit is contained in:
kadeshar
2025-09-27 23:08:18 +02:00
committed by GitHub
parent f5a6194808 662e7f1b0b
commit 05d3a44481
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/strategy/shaman/ShamanActions.cpp
View File

@@ -93,19 +93,26 @@ bool CastSpiritWalkAction::Execute(Event event)
bool SetTotemAction::Execute(Event event)
{
size_t spellIdsCount = sizeof(totemSpellIds) / sizeof(uint32);
const size_t spellIdsCount = sizeof(totemSpellIds) / sizeof(uint32);
if (spellIdsCount == 0)
return false; // early return
uint32 totemSpell = 0;
for (int i = spellIdsCount - 1; i >= 0; --i)
// Iterate backwards to prioritize the highest-rank totem spell the bot knows
for (size_t i = spellIdsCount; i-- > 0;)
{
if (bot->HasSpell(totemSpellIds[i]))
const uint32 spellId = totemSpellIds[i];
if (bot->HasSpell(spellId))
{
totemSpell = totemSpellIds[i];
totemSpell = spellId;
break;
}
}
if (!totemSpell)
if (totemSpell == 0)
return false;
bot->addActionButton(actionButtonId, totemSpell, ACTION_BUTTON_SPELL);
return true;
}

18
src/strategy/shaman/ShamanTriggers.cpp
View File

@@ -424,6 +424,7 @@ bool SetTotemTrigger::IsActive()
{
if (!bot->HasSpell(SPELL_CALL_OF_THE_ELEMENTS))
return false;
if (!bot->HasSpell(requiredSpellId))
return false;
@@ -431,13 +432,20 @@ bool SetTotemTrigger::IsActive()
if (!button || button->GetType() != ACTION_BUTTON_SPELL || button->GetAction() == 0)
return true;
size_t totemSpellIdsCount = sizeof(totemSpellIds) / sizeof(uint32);
for (size_t i = 0; i < totemSpellIdsCount; ++i)
const size_t totemSpellIdsCount = sizeof(totemSpellIds) / sizeof(uint32);
if (totemSpellIdsCount == 0)
{
if (button->GetAction() == totemSpellIds[i])
return false;
}
for (int i = (int)totemSpellIdsCount - 1; i >= 0; --i)
{
const uint32 spellId = totemSpellIds[i];
if (bot->HasSpell(spellId))
{
return false;
return button->GetAction() != spellId;
}
}
return true;
return false;
}