diff --git a/conf/playerbots.conf.dist b/conf/playerbots.conf.dist index f66b6ba9..b57e730f 100644 --- a/conf/playerbots.conf.dist +++ b/conf/playerbots.conf.dist @@ -560,9 +560,9 @@ AiPlayerbot.PremadeSpecGlyph.6.1 = 45805,43673,43547,43544,43672,43543 AiPlayerbot.PremadeSpecLink.6.1.60 = -32003350332203012300023101351 AiPlayerbot.PremadeSpecLink.6.1.80 = -32002350352203012300033101351-230200305003 AiPlayerbot.PremadeSpecName.6.2 = unholy pve -AiPlayerbot.PremadeSpecGlyph.6.2 = 43546,43673,45804,43544,43672,43549 -AiPlayerbot.PremadeSpecLink.6.2.60 = --2300303330032152000150013130151 -AiPlayerbot.PremadeSpecLink.6.2.80 = -320050500002-2300303330032152000150013133151 +AiPlayerbot.PremadeSpecGlyph.6.2 = 43542,43673,45804,43544,43672,43549 +AiPlayerbot.PremadeSpecLink.6.2.60 = --2300303340032152000150013130051 +AiPlayerbot.PremadeSpecLink.6.2.80 = -320053500001-2300303350032152000150013130051 AiPlayerbot.PremadeSpecName.6.3 = double aura blood pve AiPlayerbot.PremadeSpecGlyph.6.3 = 45805,43673,43827,43544,43672,43554 AiPlayerbot.PremadeSpecLink.6.3.60 = 005512153330030320102013-305 diff --git a/src/strategy/deathknight/DKAiObjectContext.cpp b/src/strategy/deathknight/DKAiObjectContext.cpp index 83682fa6..90e738ca 100644 --- a/src/strategy/deathknight/DKAiObjectContext.cpp +++ b/src/strategy/deathknight/DKAiObjectContext.cpp @@ -129,7 +129,7 @@ class DeathKnightAiObjectContextInternal : public NamedObjectContext creators["unholy blight"] = &DeathKnightAiObjectContextInternal::unholy_blight; creators["scourge strike"] = &DeathKnightAiObjectContextInternal::scourge_strike; creators["death and decay"] = &DeathKnightAiObjectContextInternal::death_and_decay; - creators["unholy pressence"] = &DeathKnightAiObjectContextInternal::unholy_pressence; + creators["unholy presence"] = &DeathKnightAiObjectContextInternal::unholy_presence; creators["raise dead"] = &DeathKnightAiObjectContextInternal::raise_dead; creators["army of the dead"] = &DeathKnightAiObjectContextInternal::army_of_the_dead; creators["summon gargoyle"] = &DeathKnightAiObjectContextInternal::summon_gargoyle; @@ -186,7 +186,7 @@ class DeathKnightAiObjectContextInternal : public NamedObjectContext static Action* unholy_blight(PlayerbotAI* botAI) { return new CastUnholyBlightAction(botAI); } static Action* scourge_strike(PlayerbotAI* botAI) { return new CastScourgeStrikeAction(botAI); } static Action* death_and_decay(PlayerbotAI* botAI) { return new CastDeathAndDecayAction(botAI); } - static Action* unholy_pressence(PlayerbotAI* botAI) { return new CastUnholyPresenceAction(botAI); } + static Action* unholy_presence(PlayerbotAI* botAI) { return new CastUnholyPresenceAction(botAI); } static Action* raise_dead(PlayerbotAI* botAI) { return new CastRaiseDeadAction(botAI); } static Action* army_of_the_dead(PlayerbotAI* botAI) { return new CastArmyOfTheDeadAction(botAI); } static Action* summon_gargoyle(PlayerbotAI* botAI) { return new CastSummonGargoyleAction(botAI); } diff --git a/src/strategy/deathknight/DKTriggers.cpp b/src/strategy/deathknight/DKTriggers.cpp index 12b05a3f..84d6350a 100644 --- a/src/strategy/deathknight/DKTriggers.cpp +++ b/src/strategy/deathknight/DKTriggers.cpp @@ -36,5 +36,5 @@ bool HighBloodRuneTrigger::IsActive() { } bool DesolationTrigger::IsActive() { - return bot->HasAura(66817) && HasAuraTrigger::IsActive(); + return bot->HasAura(66817) && !botAI->HasAura("desolation", GetTarget(), false, true, -1, true); } \ No newline at end of file diff --git a/src/strategy/deathknight/DKTriggers.h b/src/strategy/deathknight/DKTriggers.h index f615053c..515f8358 100644 --- a/src/strategy/deathknight/DKTriggers.h +++ b/src/strategy/deathknight/DKTriggers.h @@ -139,10 +139,10 @@ class FreezingFogTrigger : public HasAuraTrigger FreezingFogTrigger(PlayerbotAI* botAI) : HasAuraTrigger(botAI, "freezing fog") { } }; -class DesolationTrigger : public HasAuraTrigger +class DesolationTrigger : public BuffTrigger { public: - DesolationTrigger(PlayerbotAI* botAI) : HasAuraTrigger(botAI, "desolation") { } + DesolationTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "desolation") { } bool IsActive() override; };