diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.cpp b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.cpp index 2c17366d..f26823f4 100644 --- a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.cpp +++ b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.cpp @@ -2,6 +2,7 @@ #include "UtgardeKeepActions.h" #include "UtgardeKeepStrategy.h" +bool AttackFrostTombAction::isUseful() { return !botAI->IsHeal(bot); } bool AttackFrostTombAction::Execute(Event event) { Unit* frostTomb = nullptr; diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.h b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.h index 3774f374..c9c77d52 100644 --- a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.h +++ b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepActions.h @@ -12,6 +12,7 @@ class AttackFrostTombAction : public AttackAction public: AttackFrostTombAction(PlayerbotAI* ai) : AttackAction(ai, "attack frost tomb") {} bool Execute(Event event) override; + bool isUseful() override; }; class AttackDalronnAction : public AttackAction @@ -32,16 +33,16 @@ class IngvarDodgeSmashAction : public MovementAction { public: IngvarDodgeSmashAction(PlayerbotAI* ai) : MovementAction(ai, "ingvar dodge smash") {} - bool isUseful() override; bool Execute(Event event) override; + bool isUseful() override; }; class IngvarSmashReturnAction : public MovementAction { public: IngvarSmashReturnAction(PlayerbotAI* ai) : MovementAction(ai, "ingvar smash return") {} - bool isUseful() override; bool Execute(Event event) override; + bool isUseful() override; }; #endif diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.h b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.h index 0b42300e..e0b8e7af 100644 --- a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.h +++ b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepMultipliers.h @@ -1,5 +1,5 @@ -#ifndef _PLAYERRBOT_WOTLKDUNGEONUKMULTIPLIERS_H -#define _PLAYERRBOT_WOTLKDUNGEONUKMULTIPLIERS_H +#ifndef _PLAYERBOT_WOTLKDUNGEONUKMULTIPLIERS_H +#define _PLAYERBOT_WOTLKDUNGEONUKMULTIPLIERS_H #include "Multiplier.h" diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.h b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.h index f4c21aa5..90873feb 100644 --- a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.h +++ b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepStrategy.h @@ -1,5 +1,5 @@ -#ifndef _PLAYERBOT_WOTLKDUNGEONUKSTRATEGY_H_ -#define _PLAYERBOT_WOTLKDUNGEONUKSTRATEGY_H_ +#ifndef _PLAYERBOT_WOTLKDUNGEONUKSTRATEGY_H +#define _PLAYERBOT_WOTLKDUNGEONUKSTRATEGY_H #include "Multiplier.h" #include "AiObjectContext.h" diff --git a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.h b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.h index 0f0903be..db2032aa 100644 --- a/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.h +++ b/src/strategy/dungeons/wotlk/utgardekeep/UtgardeKeepTriggers.h @@ -1,15 +1,12 @@ #ifndef _PLAYERBOT_WOTLKDUNGEONUKTRIGGERS_H #define _PLAYERBOT_WOTLKDUNGEONUKTRIGGERS_H -#include "EventMap.h" #include "Trigger.h" #include "PlayerbotAIConfig.h" #include "GenericTriggers.h" #include "DungeonStrategyUtils.h" -// Taken from: -// src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp -enum Spells +enum UtgardeKeepIDs { SPELL_SUMMON_VALKYR = 42912, SPELL_RESURRECTION_BEAM = 42857, @@ -32,7 +29,6 @@ enum Spells SPELL_DARK_SMASH = 42723, SPELL_SHADOW_AXE = 42749, - // Added DEBUFF_FROST_TOMB = 48400, };