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

Variable cleanup

Browse Source
This commit is contained in:
Bobblybook
2024-09-30 23:58:21 +10:00
parent b91c56a8a5
commit 0ad188c7f8
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.cpp
View File

@@ -4,7 +4,7 @@
bool AttackFrostTombAction::Execute(Event event) bool AttackFrostTombAction::Execute(Event event)
{ {
Unit* frost_tomb = nullptr; Unit* frostTomb = nullptr;
// Target is not findable from threat table using AI_VALUE2(), // Target is not findable from threat table using AI_VALUE2(),
// therefore need to search manually for the unit name // therefore need to search manually for the unit name
@@ -15,27 +15,26 @@ bool AttackFrostTombAction::Execute(Event event)
Unit* unit = botAI->GetUnit(*i); Unit* unit = botAI->GetUnit(*i);
if (unit && unit->GetName() == "Frost Tomb") if (unit && unit->GetName() == "Frost Tomb")
{ {
frost_tomb = unit; frostTomb = unit;
break; break;
} }
} }
if (!frost_tomb || AI_VALUE(Unit*, "current target") == frost_tomb) if (!frostTomb || AI_VALUE(Unit*, "current target") == frostTomb)
{ {
return false; return false;
} }
return Attack(frost_tomb); return Attack(frostTomb);
} }
// TODO: Possibly add player stacking behaviour close to tank, to prevent Skarvald charging ranged // TODO: Possibly add player stacking behaviour close to tank, to prevent Skarvald charging ranged
bool AttackDalronnAction::Execute(Event event) bool AttackDalronnAction::Execute(Event event)
{ {
Unit* target = AI_VALUE2(Unit*, "find target", "dalronn the controller"); Unit* boss = AI_VALUE2(Unit*, "find target", "dalronn the controller");
if (!boss || AI_VALUE(Unit*, "current target") == boss)
if (!target || AI_VALUE(Unit*, "current target") == target)
{ {
return false; return false;
} }
return Attack(target); return Attack(boss);
} }
bool IngvarStopCastingAction::Execute(Event event) bool IngvarStopCastingAction::Execute(Event event)

6
src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.cpp
View File

@@ -7,7 +7,6 @@
float PrinceKelesethMultiplier::GetValue(Action* action) float PrinceKelesethMultiplier::GetValue(Action* action)
{ {
Unit* boss = AI_VALUE2(Unit*, "find target", "prince keleseth"); Unit* boss = AI_VALUE2(Unit*, "find target", "prince keleseth");
if (!boss) if (!boss)
{ {
return 1.0f; return 1.0f;
@@ -37,7 +36,7 @@ float SkarvaldAndDalronnMultiplier::GetValue(Action* action)
float IngvarThePlundererMultiplier::GetValue(Action* action) float IngvarThePlundererMultiplier::GetValue(Action* action)
{ {
Unit* boss = AI_VALUE2(Unit*, "find target", "ingvar the plunderer"); Unit* boss = AI_VALUE2(Unit*, "find target", "ingvar the plunderer");
bool isTank = botAI->IsTank(bot); bool isTank = botAI->IsTank(bot);
if (!boss) if (!boss)
{ {
@@ -58,8 +57,7 @@ float IngvarThePlundererMultiplier::GetValue(Action* action)
{ {
if (dynamic_cast<CastSpellAction*>(action)) if (dynamic_cast<CastSpellAction*>(action))
{ {
std::string const name = action->getName(); uint32 spellId = AI_VALUE2(uint32, "spell id", action->getName());
uint32 spellId = AI_VALUE2(uint32, "spell id", name);
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId);
if (!spellInfo) if (!spellInfo)
{ {