From de5dde91f6aad2460a0d313aa36f85ef902bdd8c Mon Sep 17 00:00:00 2001 From: Alvin Zhu Date: Mon, 6 Mar 2023 21:15:17 +0800 Subject: [PATCH] fix DK spell --- src/strategy/deathknight/DKActions.h | 8 ++++---- src/strategy/deathknight/DKAiObjectContext.cpp | 16 ++++++++-------- src/strategy/deathknight/DKTriggers.h | 8 ++++---- src/strategy/deathknight/FrostDKStrategy.cpp | 2 +- src/strategy/deathknight/GenericDKStrategy.cpp | 6 +++--- src/strategy/deathknight/UnholyDKStrategy.cpp | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/strategy/deathknight/DKActions.h b/src/strategy/deathknight/DKActions.h index d205cd88..6f28a9aa 100644 --- a/src/strategy/deathknight/DKActions.h +++ b/src/strategy/deathknight/DKActions.h @@ -144,10 +144,10 @@ END_SPELL_ACTION() BEGIN_MELEE_SPELL_ACTION(CastAntiMagicZoneAction, "anti magic zone") END_SPELL_ACTION() -class CastChbotAInsOfIceAction : public CastSpellAction +class CastChainsOfIceAction : public CastSpellAction { public: - CastChbotAInsOfIceAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "chbotAIns of ice") { } + CastChainsOfIceAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "chains of ice") { } }; class CastHungeringColdAction : public CastMeleeSpellAction @@ -258,10 +258,10 @@ class CastArmyOfTheDeadAction : public CastBuffSpellAction CastArmyOfTheDeadAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "army of the dead") { } }; -class CastRbotAIseDeadAction : public CastBuffSpellAction +class CastRaiseDeadAction : public CastBuffSpellAction { public: - CastRbotAIseDeadAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "rbotAIse dead") { } + CastRaiseDeadAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "raise dead") { } }; class CastKillingMachineAction : public CastBuffSpellAction diff --git a/src/strategy/deathknight/DKAiObjectContext.cpp b/src/strategy/deathknight/DKAiObjectContext.cpp index ecadc14b..ef6e940e 100644 --- a/src/strategy/deathknight/DKAiObjectContext.cpp +++ b/src/strategy/deathknight/DKAiObjectContext.cpp @@ -82,8 +82,8 @@ class DeathKnightTriggerFactoryInternal : public NamedObjectContext creators["strangulate"] = &DeathKnightTriggerFactoryInternal::strangulate; creators["strangulate on enemy healer"] = &DeathKnightTriggerFactoryInternal::strangulate_on_enemy_healer; creators["blood tap"] = &DeathKnightTriggerFactoryInternal::blood_tap; - creators["rbotAIse dead"] = &DeathKnightTriggerFactoryInternal::rbotAIse_dead; - creators["chbotAIns of ice"] = &DeathKnightTriggerFactoryInternal::chbotAIns_of_ice; + creators["raise dead"] = &DeathKnightTriggerFactoryInternal::raise_dead; + creators["chains of ice"] = &DeathKnightTriggerFactoryInternal::chains_of_ice; } private: @@ -102,8 +102,8 @@ class DeathKnightTriggerFactoryInternal : public NamedObjectContext static Trigger* strangulate(PlayerbotAI* botAI) { return new StrangulateInterruptSpellTrigger(botAI); } static Trigger* strangulate_on_enemy_healer(PlayerbotAI* botAI) { return new StrangulateOnEnemyHealerTrigger(botAI); } static Trigger* blood_tap(PlayerbotAI* botAI) { return new BloodTapTrigger(botAI); } - static Trigger* rbotAIse_dead(PlayerbotAI* botAI) { return new RbotAIseDeadTrigger(botAI); } - static Trigger* chbotAIns_of_ice(PlayerbotAI* botAI) { return new ChbotAInsOfIceSnareTrigger(botAI); } + static Trigger* raise_dead(PlayerbotAI* botAI) { return new RaiseDeadTrigger(botAI); } + static Trigger* chains_of_ice(PlayerbotAI* botAI) { return new ChainsOfIceSnareTrigger(botAI); } }; class DeathKnightAiObjectContextInternal : public NamedObjectContext @@ -122,7 +122,7 @@ class DeathKnightAiObjectContextInternal : public NamedObjectContext creators["scourge strike"] = &DeathKnightAiObjectContextInternal::scourge_strike; creators["death and decay"] = &DeathKnightAiObjectContextInternal::death_and_decay; creators["unholy pressence"] = &DeathKnightAiObjectContextInternal::unholy_pressence; - creators["rbotAIse dead"] = &DeathKnightAiObjectContextInternal::rbotAIse_dead; + creators["raise dead"] = &DeathKnightAiObjectContextInternal::raise_dead; creators["army of the dead"] = &DeathKnightAiObjectContextInternal::army_of_the_dead; creators["summon gargoyle"] = &DeathKnightAiObjectContextInternal::summon_gargoyle; creators["anti magic shell"] = &DeathKnightAiObjectContextInternal::anti_magic_shell; @@ -135,7 +135,7 @@ class DeathKnightAiObjectContextInternal : public NamedObjectContext creators["obliterate"] = &DeathKnightAiObjectContextInternal::obliterate; creators["howling blast"] = &DeathKnightAiObjectContextInternal::howling_blast; creators["frost strike"] = &DeathKnightAiObjectContextInternal::frost_strike; - creators["chbotAIns of ice"] = &DeathKnightAiObjectContextInternal::chbotAIns_of_ice; + creators["chains of ice"] = &DeathKnightAiObjectContextInternal::chains_of_ice; creators["rune strike"] = &DeathKnightAiObjectContextInternal::rune_strike; //creators["icy clutch"] = &DeathKnightAiObjectContextInternal::icy_clutch; creators["horn of winter"] = &DeathKnightAiObjectContextInternal::horn_of_winter; @@ -179,7 +179,7 @@ class DeathKnightAiObjectContextInternal : public NamedObjectContext 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* rbotAIse_dead(PlayerbotAI* botAI) { return new CastRbotAIseDeadAction(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); } static Action* anti_magic_shell(PlayerbotAI* botAI) { return new CastAntiMagicShellAction(botAI); } @@ -192,7 +192,7 @@ class DeathKnightAiObjectContextInternal : public NamedObjectContext static Action* obliterate(PlayerbotAI* botAI) { return new CastObliterateAction(botAI); } static Action* howling_blast(PlayerbotAI* botAI) { return new CastHowlingBlastAction(botAI); } static Action* frost_strike(PlayerbotAI* botAI) { return new CastFrostStrikeAction(botAI); } - static Action* chbotAIns_of_ice(PlayerbotAI* botAI) { return new CastChbotAInsOfIceAction(botAI); } + static Action* chains_of_ice(PlayerbotAI* botAI) { return new CastChainsOfIceAction(botAI); } static Action* rune_strike(PlayerbotAI* botAI) { return new CastRuneStrikeAction(botAI); } //static Action* icy_clutch(PlayerbotAI* botAI) { return new CastIcyClutchAction(botAI); } static Action* horn_of_winter(PlayerbotAI* botAI) { return new CastHornOfWinterAction(botAI); } diff --git a/src/strategy/deathknight/DKTriggers.h b/src/strategy/deathknight/DKTriggers.h index 13d6bdec..9a3a4a9a 100644 --- a/src/strategy/deathknight/DKTriggers.h +++ b/src/strategy/deathknight/DKTriggers.h @@ -41,10 +41,10 @@ class BloodTapTrigger : public BuffTrigger BloodTapTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "blood tap") { } }; -class RbotAIseDeadTrigger : public BuffTrigger +class RaiseDeadTrigger : public BuffTrigger { public: - RbotAIseDeadTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "rbotAIse dead") { } + RaiseDeadTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "raise dead") { } }; class RuneStrikeTrigger : public SpellCanBeCastTrigger @@ -101,10 +101,10 @@ class MindFreezeOnEnemyHealerTrigger : public InterruptEnemyHealerTrigger MindFreezeOnEnemyHealerTrigger(PlayerbotAI* botAI) : InterruptEnemyHealerTrigger(botAI, "mind freeze") { } }; -class ChbotAInsOfIceSnareTrigger : public SnareTargetTrigger +class ChainsOfIceSnareTrigger : public SnareTargetTrigger { public: - ChbotAInsOfIceSnareTrigger(PlayerbotAI* botAI) : SnareTargetTrigger(botAI, "chbotAIns of ice") { } + ChainsOfIceSnareTrigger(PlayerbotAI* botAI) : SnareTargetTrigger(botAI, "chains of ice") { } }; class StrangulateOnEnemyHealerTrigger : public InterruptEnemyHealerTrigger diff --git a/src/strategy/deathknight/FrostDKStrategy.cpp b/src/strategy/deathknight/FrostDKStrategy.cpp index 9a263f98..cecc476e 100644 --- a/src/strategy/deathknight/FrostDKStrategy.cpp +++ b/src/strategy/deathknight/FrostDKStrategy.cpp @@ -14,7 +14,7 @@ class FrostDKStrategyActionNodeFactory : public NamedObjectFactory creators["obliterate"] = &obliterate; creators["howling blast"] = &howling_blast; creators["frost strike"] = &frost_strike; - //creators["chbotAIns of ice"] = &chbotAIns_of_ice; + //creators["chains of ice"] = &chains_of_ice; creators["rune strike"] = &rune_strike; //creators["icy clutch"] = &icy_clutch; //creators["horn of winter"] = &horn_of_winter; diff --git a/src/strategy/deathknight/GenericDKStrategy.cpp b/src/strategy/deathknight/GenericDKStrategy.cpp index acc99c33..270c25f2 100644 --- a/src/strategy/deathknight/GenericDKStrategy.cpp +++ b/src/strategy/deathknight/GenericDKStrategy.cpp @@ -20,7 +20,7 @@ class GenericDKStrategyActionNodeFactory : public NamedObjectFactory //creators["dark command"] = &dark_command; taunt //frost - //creators["chbotAIns of ice"] = &chbotAIns_of_ice; + //creators["chains of ice"] = &chains_of_ice; //creators["icy clutch"] = &icy_clutch; creators["horn of winter"] = &horn_of_winter; creators["killing machine"] = &killing_machine; // buff @@ -34,7 +34,7 @@ class GenericDKStrategyActionNodeFactory : public NamedObjectFactory //unholy //creators["death and decay"] = &death_and_decay; - //creators["rbotAIse dead"] = &rbotAIse_dead; + //creators["raise dead"] = &raise_dead; //creators["army of the dead"] = &army of the dead; //creators["summon gargoyle"] = &army of the dead; //creators["anti magic shell"] = &anti_magic_shell; cd @@ -160,7 +160,7 @@ void GenericDKStrategy::InitTriggers(std::vector& triggers) triggers.push_back(new TriggerNode("high aoe", NextAction::array(0, new NextAction("anti magic shell", ACTION_NORMAL + 3), nullptr))); triggers.push_back(new TriggerNode("death coil", NextAction::array(0, new NextAction("death coil", ACTION_NORMAL + 3), nullptr))); triggers.push_back(new TriggerNode("critical aoe heal", NextAction::array(0, new NextAction("anti magic zone", ACTION_EMERGENCY + 1), nullptr))); - triggers.push_back(new TriggerNode("no pet", NextAction::array(0, new NextAction("rbotAIse dead", ACTION_NORMAL + 5), nullptr))); + triggers.push_back(new TriggerNode("no pet", NextAction::array(0, new NextAction("raise dead", ACTION_NORMAL + 5), nullptr))); triggers.push_back(new TriggerNode("mind freeze", NextAction::array(0, new NextAction("mind freeze", ACTION_HIGH + 1), nullptr))); triggers.push_back(new TriggerNode("bone shield", NextAction::array(0, new NextAction("bone shield", ACTION_NORMAL + 1), nullptr))); triggers.push_back(new TriggerNode("horn of winter", NextAction::array(0, new NextAction("horn of winter", ACTION_NORMAL + 1), nullptr))); diff --git a/src/strategy/deathknight/UnholyDKStrategy.cpp b/src/strategy/deathknight/UnholyDKStrategy.cpp index 1e255b10..44cd0fd2 100644 --- a/src/strategy/deathknight/UnholyDKStrategy.cpp +++ b/src/strategy/deathknight/UnholyDKStrategy.cpp @@ -20,7 +20,7 @@ class UnholyDKStrategyActionNodeFactory : public NamedObjectFactory creators["scourge strike"] = &scourge_strike; //creators["death and decay"] = &death_and_decay; //creators["unholy pressence"] = &unholy_pressence; - //creators["rbotAIse dead"] = &rbotAIse_dead; + //creators["raise dead"] = &raise_dead; //creators["army of the dead"] = &army of the dead; //creators["summon gargoyle"] = &army of the dead; //creators["anti magic shell"] = &anti_magic_shell; @@ -70,7 +70,7 @@ void UnholyDKStrategy::InitTriggers(std::vector& triggers) void UnholyDKAoeStrategy::InitTriggers(std::vector& triggers) { - triggers.push_back(new TriggerNode("loot avbotAIlable", NextAction::array(0, new NextAction("corpse explosion", ACTION_NORMAL + 1), nullptr))); + triggers.push_back(new TriggerNode("loot available", NextAction::array(0, new NextAction("corpse explosion", ACTION_NORMAL + 1), nullptr))); triggers.push_back(new TriggerNode("medium aoe", NextAction::array(0, new NextAction("death and decay", ACTION_NORMAL + 3), new NextAction("corpse explosion", ACTION_NORMAL + 3), nullptr))); }