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

Simplify checks & implement getbottext method

Browse Source
This commit is contained in:
crow
2025-09-28 20:31:57 -05:00
parent 0afeca4300
commit 55b58a2ef6
3 changed files with 43 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/strategy/raids/karazhan/RaidKarazhanActions.cpp
View File

@@ -1,9 +1,10 @@
#include "RaidKarazhanActions.h" #include "RaidKarazhanActions.h"
#include "RaidKarazhanHelpers.h" #include "RaidKarazhanHelpers.h"
#include "AiObjectContext.h" #include "AiObjectContext.h"
#include "Playerbots.h"
#include "PlayerbotMgr.h"
#include "PlayerbotAI.h" #include "PlayerbotAI.h"
#include "PlayerbotMgr.h"
#include "PlayerbotTextMgr.h"
#include "Playerbots.h"
#include "Position.h" #include "Position.h"
namespace namespace
@@ -261,26 +262,16 @@ bool KarazhanWizardOfOzMarkTargetAction::Execute(Event event)
bool KarazhanWizardOfOzScorchStrawmanAction::Execute(Event event) bool KarazhanWizardOfOzScorchStrawmanAction::Execute(Event event)
{ {
Unit* strawman = AI_VALUE2(Unit*, "find target", "strawman"); Unit* strawman = AI_VALUE2(Unit*, "find target", "strawman");
Group* group = bot->GetGroup(); if (!strawman || !strawman->IsAlive() || bot->getClass() != CLASS_MAGE)
if (!strawman || !strawman->IsAlive() || !group)
{ {
return false; return false;
} }
for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) if (botAI->CanCastSpell("scorch", strawman))
{ {
Player* member = itr->GetSource(); botAI->CastSpell("scorch", strawman);
PlayerbotAI* mageAI = sPlayerbotsMgr->GetPlayerbotAI(member);
if (!member || !member->IsAlive() || member->getClass() != CLASS_MAGE || !mageAI)
{
continue;
}
if (mageAI->CanCastSpell("scorch", strawman))
{
mageAI->CastSpell("scorch", strawman);
}
} }
return false; return false;
} }
@@ -471,8 +462,8 @@ bool KarazhanShadeOfAranSpreadRangedAction::isUseful()
!(boss->HasUnitState(UNIT_STATE_CASTING) && boss->FindCurrentSpellBySpellId(SPELL_ARCANE_EXPLOSION)); !(boss->HasUnitState(UNIT_STATE_CASTING) && boss->FindCurrentSpellBySpellId(SPELL_ARCANE_EXPLOSION));
} }
// One tank per phase will dance in and out of the red beam (5 seconds in, 5 seconds out) // One tank bot per phase will dance in and out of the red beam (5 seconds in, 5 seconds out)
// Tanks will ignore void zones--their positioning is too important // Tank bots will ignore void zones--their positioning is too important
bool KarazhanNetherspiteBlockRedBeamAction::Execute(Event event) bool KarazhanNetherspiteBlockRedBeamAction::Execute(Event event)
{ {
Unit* boss = AI_VALUE2(Unit*, "find target", "netherspite"); Unit* boss = AI_VALUE2(Unit*, "find target", "netherspite");
@@ -488,8 +479,7 @@ bool KarazhanNetherspiteBlockRedBeamAction::Execute(Event event)
for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next())
{ {
Player* member = itr->GetSource(); Player* member = itr->GetSource();
PlayerbotAI* memberAI = sPlayerbotsMgr->GetPlayerbotAI(member); if (!member || !member->IsAlive() || !botAI->IsTank(member) || !GET_PLAYERBOT_AI(member) ||
if (!member || !member->IsAlive() || !memberAI || !memberAI->IsTank(member) ||
member->HasAura(SPELL_NETHER_EXHAUSTION_RED)) member->HasAura(SPELL_NETHER_EXHAUSTION_RED))
{ {
continue; continue;
@@ -502,18 +492,11 @@ bool KarazhanNetherspiteBlockRedBeamAction::Execute(Event event)
if (bot == eligibleTank) if (bot == eligibleTank)
{ {
std::string msg;
std::map<std::string, std::string> ph; std::map<std::string, std::string> ph;
ph["%player"] = bot->GetName(); ph["%player"] = bot->GetName();
bool got = sPlayerbotTextMgr->GetBotText("netherspite_beam_blocking_red", msg, ph); std::string text = sPlayerbotTextMgr->GetBotTextOrDefault(
if (got && !msg.empty()) "netherspite_beam_blocking_red", "%player is moving to block the red beam!", ph);
{ bot->Yell(text, LANG_UNIVERSAL);
bot->Yell(msg, LANG_UNIVERSAL);
}
else
{
bot->Yell(bot->GetName() + " is moving to block the red beam!", LANG_UNIVERSAL);
}
ObjectGuid botGuid = bot->GetGUID(); ObjectGuid botGuid = bot->GetGUID();
uint32 intervalSecs = 5; uint32 intervalSecs = 5;
@@ -591,7 +574,7 @@ bool KarazhanNetherspiteBlockRedBeamAction::isUseful()
return true; return true;
} }
// Two non-Rogue/Warrior DPS will block the blue beam for each phase (swap at 25 debuff stacks) // Two non-Rogue/Warrior DPS bots will block the blue beam for each phase (swap at 25 debuff stacks)
// When avoiding void zones, blocking bots will move along the beam to continue blocking // When avoiding void zones, blocking bots will move along the beam to continue blocking
bool KarazhanNetherspiteBlockBlueBeamAction::Execute(Event event) bool KarazhanNetherspiteBlockBlueBeamAction::Execute(Event event)
{ {
@@ -608,18 +591,11 @@ bool KarazhanNetherspiteBlockBlueBeamAction::Execute(Event event)
if (wasBlocking && !isBlockingNow) if (wasBlocking && !isBlockingNow)
{ {
std::string msg;
std::map<std::string, std::string> ph; std::map<std::string, std::string> ph;
ph["%player"] = bot->GetName(); ph["%player"] = bot->GetName();
bool got = sPlayerbotTextMgr->GetBotText("netherspite_beam_leaving_blue", msg, ph); std::string text = sPlayerbotTextMgr->GetBotTextOrDefault(
if (got && !msg.empty()) "netherspite_beam_leaving_blue", "%player is leaving the blue beam--next blocker up!", ph);
{ bot->Yell(text, LANG_UNIVERSAL);
bot->Yell(msg, LANG_UNIVERSAL);
}
else
{
bot->Yell(bot->GetName() + " is leaving the blue beam--next blocker up!", LANG_UNIVERSAL);
}
wasBlockingBlueBeam[botGuid] = false; wasBlockingBlueBeam[botGuid] = false;
return false; return false;
@@ -629,18 +605,11 @@ bool KarazhanNetherspiteBlockBlueBeamAction::Execute(Event event)
{ {
if (!wasBlocking) if (!wasBlocking)
{ {
std::string msg;
std::map<std::string, std::string> ph; std::map<std::string, std::string> ph;
ph["%player"] = bot->GetName(); ph["%player"] = bot->GetName();
bool got = sPlayerbotTextMgr->GetBotText("netherspite_beam_blocking_blue", msg, ph); std::string text = sPlayerbotTextMgr->GetBotTextOrDefault(
if (got && !msg.empty()) "netherspite_beam_blocking_blue", "%player is moving to block the blue beam!", ph);
{ bot->Yell(text, LANG_UNIVERSAL);
bot->Yell(msg, LANG_UNIVERSAL);
}
else
{
bot->Yell(bot->GetName() + " is moving to block the blue beam!", LANG_UNIVERSAL);
}
} }
wasBlockingBlueBeam[botGuid] = true; wasBlockingBlueBeam[botGuid] = true;
@@ -712,8 +681,8 @@ bool KarazhanNetherspiteBlockBlueBeamAction::isUseful()
return boss && bluePortal && !boss->HasAura(SPELL_NETHERSPITE_BANISHED); return boss && bluePortal && !boss->HasAura(SPELL_NETHERSPITE_BANISHED);
} }
// Two healers will block the green beam for each phase (swap at 25 debuff stacks) // Two healer bots will block the green beam for each phase (swap at 25 debuff stacks)
// OR one rogue or DPS warrior will block the green beam for an entire phase (if they begin the phase as the blocker) // OR one rogue or DPS warrior bot will block the green beam for an entire phase (if they begin the phase as the blocker)
// When avoiding void zones, blocking bots will move along the beam to continue blocking // When avoiding void zones, blocking bots will move along the beam to continue blocking
bool KarazhanNetherspiteBlockGreenBeamAction::Execute(Event event) bool KarazhanNetherspiteBlockGreenBeamAction::Execute(Event event)
{ {
@@ -730,18 +699,11 @@ bool KarazhanNetherspiteBlockGreenBeamAction::Execute(Event event)
if (wasBlocking && !isBlockingNow) if (wasBlocking && !isBlockingNow)
{ {
std::string msg;
std::map<std::string, std::string> ph; std::map<std::string, std::string> ph;
ph["%player"] = bot->GetName(); ph["%player"] = bot->GetName();
bool got = sPlayerbotTextMgr->GetBotText("netherspite_beam_leaving_green", msg, ph); std::string text = sPlayerbotTextMgr->GetBotTextOrDefault(
if (got && !msg.empty()) "netherspite_beam_leaving_green", "%player is leaving the green beam--next blocker up!", ph);
{ bot->Yell(text, LANG_UNIVERSAL);
bot->Yell(msg, LANG_UNIVERSAL);
}
else
{
bot->Yell(bot->GetName() + " TESTRUN is leaving the green beam--next blocker up!", LANG_UNIVERSAL);
}
wasBlockingGreenBeam[botGuid] = false; wasBlockingGreenBeam[botGuid] = false;
return false; return false;
@@ -751,18 +713,11 @@ bool KarazhanNetherspiteBlockGreenBeamAction::Execute(Event event)
{ {
if (!wasBlocking) if (!wasBlocking)
{ {
std::string msg;
std::map<std::string, std::string> ph; std::map<std::string, std::string> ph;
ph["%player"] = bot->GetName(); ph["%player"] = bot->GetName();
bool got = sPlayerbotTextMgr->GetBotText("netherspite_beam_blocking_green", msg, ph); std::string text = sPlayerbotTextMgr->GetBotTextOrDefault(
if (got && !msg.empty()) "netherspite_beam_blocking_green", "%player is moving to block the green beam!", ph);
{ bot->Yell(text, LANG_UNIVERSAL);
bot->Yell(msg, LANG_UNIVERSAL);
}
else
{
bot->Yell(bot->GetName() + " TESTRUN is moving to block the green beam!", LANG_UNIVERSAL);
}
} }
wasBlockingGreenBeam[botGuid] = true; wasBlockingGreenBeam[botGuid] = true;

25
src/strategy/raids/karazhan/RaidKarazhanHelpers.cpp
View File

@@ -132,7 +132,7 @@ bool RaidKarazhanHelpers::IsFlameWreathActive()
return false; return false;
} }
// Blue beam blockers: non-Rogue/Warrior DPS, no Nether Exhaustion Blue and <25 stacks of Blue Beam debuff // Blue beam blockers: non-Rogue/Warrior DPS bots, no Nether Exhaustion Blue and <25 stacks of Blue Beam debuff
std::vector<Player*> RaidKarazhanHelpers::GetBlueBlockers() std::vector<Player*> RaidKarazhanHelpers::GetBlueBlockers()
{ {
std::vector<Player*> blueBlockers; std::vector<Player*> blueBlockers;
@@ -162,8 +162,8 @@ std::vector<Player*> RaidKarazhanHelpers::GetBlueBlockers()
} }
// Green beam blockers: // Green beam blockers:
// (1) Rogues and non-tank Warriors, no Nether Exhaustion Green // (1) Rogue and non-tank Warrior bots, no Nether Exhaustion Green
// (2) Healers, no Nether Exhaustion Green and <25 stacks of Green Beam debuff // (2) Healer bots, no Nether Exhaustion Green and <25 stacks of Green Beam debuff
std::vector<Player*> RaidKarazhanHelpers::GetGreenBlockers() std::vector<Player*> RaidKarazhanHelpers::GetGreenBlockers()
{ {
std::vector<Player*> greenBlockers; std::vector<Player*> greenBlockers;
@@ -226,20 +226,19 @@ std::tuple<Player*, Player*, Player*> RaidKarazhanHelpers::GetCurrentBeamBlocker
Player* blueBlocker = nullptr; Player* blueBlocker = nullptr;
std::vector<Player*> redBlockers; std::vector<Player*> redBlockers;
if (Group* group = bot->GetGroup()) if (Group* group = bot->GetGroup())
{
for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next())
{ {
Player* member = itr->GetSource(); for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next())
PlayerbotAI* memberAI = sPlayerbotsMgr->GetPlayerbotAI(member);
if (!member || !member->IsAlive() || !memberAI || !memberAI->IsTank(member) ||
member->HasAura(SPELL_NETHER_EXHAUSTION_RED))
{ {
continue; Player* member = itr->GetSource();
if (!member || !member->IsAlive() || !botAI->IsTank(member) || !GET_PLAYERBOT_AI(member) ||
member->HasAura(SPELL_NETHER_EXHAUSTION_RED))
{
continue;
}
redBlockers.push_back(member);
} }
redBlockers.push_back(member);
} }
}
if (!redBlockers.empty()) if (!redBlockers.empty())
{ {
redBlocker = redBlockers.front(); redBlocker = redBlockers.front();

6
src/strategy/raids/karazhan/RaidKarazhanMultipliers.cpp
View File

@@ -27,9 +27,9 @@ float KarazhanBigBadWolfMultiplier::GetValue(Action* action)
{ {
if ((dynamic_cast<MovementAction*>(action) && !dynamic_cast<KarazhanBigBadWolfRunAwayAction*>(action)) || if ((dynamic_cast<MovementAction*>(action) && !dynamic_cast<KarazhanBigBadWolfRunAwayAction*>(action)) ||
(dynamic_cast<AttackAction*>(action))) (dynamic_cast<AttackAction*>(action)))
{ {
return 0.0f; return 0.0f;
} }
} }
return 1.0f; return 1.0f;