diff --git a/src/strategy/mage/FrostMageStrategy.cpp b/src/strategy/mage/FrostMageStrategy.cpp index 39822aa1..fcafcee3 100644 --- a/src/strategy/mage/FrostMageStrategy.cpp +++ b/src/strategy/mage/FrostMageStrategy.cpp @@ -5,15 +5,68 @@ #include "FrostMageStrategy.h" #include "Playerbots.h" +class FrostMageStrategyActionNodeFactory : public NamedObjectFactory +{ +public: + FrostMageStrategyActionNodeFactory() + { + creators["deep freeze"] = &deep_freeze; + creators["frostbolt and deep freeze"] = &frostbolt_and_deep_freeze; + } +private: + static ActionNode* cold_snap([[maybe_unused]] PlayerbotAI* botAI) + { + return new ActionNode ("cold snap", + /*P*/ nullptr, + /*A*/ nullptr, + /*C*/ nullptr); + } + + static ActionNode* ice_barrier([[maybe_unused]] PlayerbotAI* botAI) + { + return new ActionNode ("ice_barrier", + /*P*/ nullptr, + /*A*/ nullptr, + /*C*/ nullptr); + } + + static ActionNode* summon_water_elemental([[maybe_unused]] PlayerbotAI* botAI) + { + return new ActionNode ("summon water elemental", + /*P*/ nullptr, + /*A*/ nullptr, + /*C*/ nullptr); + } + + static ActionNode* deep_freeze([[maybe_unused]] PlayerbotAI* botAI) + { + return new ActionNode ("deep freeze", + /*P*/ nullptr, + /*A*/ NextAction::array(0, new NextAction("ice lance"), nullptr), + /*C*/ nullptr); + } + + static ActionNode* frostbolt_and_deep_freeze([[maybe_unused]] PlayerbotAI* botAI) + // Combo cast the last charge of fingers of frost for double crits. + // Should only do this on the final charge of FoF. + { + return new ActionNode ("frostbolt", + /*P*/ nullptr, + /*A*/ nullptr, + /*C*/ NextAction::array(0, new NextAction("deep freeze"), NULL)); + } +}; + FrostMageStrategy::FrostMageStrategy(PlayerbotAI* botAI) : GenericMageStrategy(botAI) { + actionNodeFactories.Add(new FrostMageStrategyActionNodeFactory()); } NextAction** FrostMageStrategy::getDefaultActions() { return NextAction::array(0, - new NextAction("frostbolt", ACTION_DEFAULT + 0.1f), - new NextAction("shoot", ACTION_DEFAULT), + new NextAction("frostbolt", ACTION_DEFAULT + 0.1f), + new NextAction("shoot", ACTION_DEFAULT), nullptr); } @@ -21,11 +74,22 @@ NextAction** FrostMageStrategy::getDefaultActions() void FrostMageStrategy::InitTriggers(std::vector& triggers) { GenericMageStrategy::InitTriggers(triggers); - triggers.push_back(new TriggerNode("icy veins", NextAction::array(0, new NextAction("icy veins", 50.0f), nullptr))); + // No logic currently for cold snap usage.. possibly use right after icy veins drops off? + // triggers.push_back(new TriggerNode("cold snap", NextAction::array(0, new NextAction("cold snap", 50.0f), nullptr))); + + triggers.push_back(new TriggerNode("no pet", NextAction::array(0, new NextAction("summon water elemental", 70.0f), nullptr))); + triggers.push_back(new TriggerNode("ice barrier", NextAction::array(0, new NextAction("ice barrier", 30.0f), nullptr))); + + triggers.push_back(new TriggerNode("brain freeze", NextAction::array(0, new NextAction("frostfire bolt", 60.0f), nullptr))); + triggers.push_back(new TriggerNode("fingers of frost single", NextAction::array(0, new NextAction("frostbolt and deep freeze", 20.0f), nullptr))); + // May not need this, frostbolt is the default action so probably don't need to specify. + // Maybe uncomment if you find the mage is prioritising auxillary spells while this buff is up, and wasting the proc. + // triggers.push_back(new TriggerNode("fingers of frost double", NextAction::array(0, new NextAction("frostbolt", 10.0f), nullptr))); } void FrostMageAoeStrategy::InitTriggers(std::vector& triggers) { - triggers.push_back(new TriggerNode("light aoe", NextAction::array(0, new NextAction("blizzard", 40.0f), nullptr))); + triggers.push_back(new TriggerNode("medium aoe", NextAction::array(0, new NextAction("blizzard", 40.0f), nullptr))); + triggers.push_back(new TriggerNode("light aoe", NextAction::array(0, new NextAction("cone of cold", 45.0f), nullptr))); } diff --git a/src/strategy/mage/GenericMageStrategy.cpp b/src/strategy/mage/GenericMageStrategy.cpp index e6bff447..682ddfb4 100644 --- a/src/strategy/mage/GenericMageStrategy.cpp +++ b/src/strategy/mage/GenericMageStrategy.cpp @@ -12,9 +12,12 @@ class GenericMageStrategyActionNodeFactory : public NamedObjectFactory* GetTargetValue() override; }; @@ -223,7 +263,6 @@ class CastEvocationAction : public CastSpellAction { public: CastEvocationAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "evocation") { } - std::string const GetTargetName() override { return "self target"; } }; diff --git a/src/strategy/mage/MageAiObjectContext.cpp b/src/strategy/mage/MageAiObjectContext.cpp index 671ea97e..894c0231 100644 --- a/src/strategy/mage/MageAiObjectContext.cpp +++ b/src/strategy/mage/MageAiObjectContext.cpp @@ -79,7 +79,12 @@ class MageTriggerFactoryInternal : public NamedObjectContext creators["fireball"] = &MageTriggerFactoryInternal::fireball; creators["pyroblast"] = &MageTriggerFactoryInternal::pyroblast; creators["combustion"] = &MageTriggerFactoryInternal::combustion; + creators["fingers of frost single"] = &MageTriggerFactoryInternal::fingers_of_frost_single; + creators["fingers of frost double"] = &MageTriggerFactoryInternal::fingers_of_frost_double; + creators["brain freeze"] = &MageTriggerFactoryInternal::brain_freeze; creators["icy veins"] = &MageTriggerFactoryInternal::icy_veins; + creators["cold snap"] = &MageTriggerFactoryInternal::cold_snap; + creators["ice barrier"] = &MageTriggerFactoryInternal::ice_barrier; creators["arcane intellect"] = &MageTriggerFactoryInternal::arcane_intellect; creators["arcane intellect on party"] = &MageTriggerFactoryInternal::arcane_intellect_on_party; creators["mage armor"] = &MageTriggerFactoryInternal::mage_armor; @@ -110,7 +115,12 @@ class MageTriggerFactoryInternal : public NamedObjectContext static Trigger* fireball(PlayerbotAI* botAI) { return new FireballTrigger(botAI); } static Trigger* pyroblast(PlayerbotAI* botAI) { return new PyroblastTrigger(botAI); } static Trigger* combustion(PlayerbotAI* botAI) { return new CombustionTrigger(botAI); } + static Trigger* fingers_of_frost_single(PlayerbotAI* botAI) { return new FingersOfFrostSingleTrigger(botAI); } + static Trigger* fingers_of_frost_double(PlayerbotAI* botAI) { return new FingersOfFrostDoubleTrigger(botAI); } + static Trigger* brain_freeze(PlayerbotAI* botAI) { return new BrainFreezeTrigger(botAI); } static Trigger* icy_veins(PlayerbotAI* botAI) { return new IcyVeinsTrigger(botAI); } + static Trigger* cold_snap(PlayerbotAI* botAI) { return new ColdSnapTrigger(botAI); } + static Trigger* ice_barrier(PlayerbotAI* botAI) { return new IceBarrierTrigger(botAI); } static Trigger* arcane_intellect(PlayerbotAI* botAI) { return new ArcaneIntellectTrigger(botAI); } static Trigger* arcane_intellect_on_party(PlayerbotAI* botAI) { return new ArcaneIntellectOnPartyTrigger(botAI); } static Trigger* mage_armor(PlayerbotAI* botAI) { return new MageArmorTrigger(botAI); } @@ -135,7 +145,11 @@ class MageAiObjectContextInternal : public NamedObjectContext creators["arcane power"] = &MageAiObjectContextInternal::arcane_power; creators["presence of mind"] = &MageAiObjectContextInternal::presence_of_mind; creators["frostbolt"] = &MageAiObjectContextInternal::frostbolt; + creators["frostfire bolt"] = &MageAiObjectContextInternal::frostfire_bolt; + creators["ice lance"] = &MageAiObjectContextInternal::ice_lance; + creators["deep freeze"] = &MageAiObjectContextInternal::deep_freeze; creators["blizzard"] = &MageAiObjectContextInternal::blizzard; + creators["cone of cold"] = &MageAiObjectContextInternal::cone_of_cold; creators["frost nova"] = &MageAiObjectContextInternal::frost_nova; creators["arcane intellect"] = &MageAiObjectContextInternal::arcane_intellect; creators["arcane intellect on party"] = &MageAiObjectContextInternal::arcane_intellect_on_party; @@ -156,6 +170,9 @@ class MageAiObjectContextInternal : public NamedObjectContext creators["remove lesser curse"] = &MageAiObjectContextInternal::remove_lesser_curse; creators["remove lesser curse on party"] = &MageAiObjectContextInternal::remove_lesser_curse_on_party; creators["icy veins"] = &MageAiObjectContextInternal::icy_veins; + creators["cold snap"] = &MageAiObjectContextInternal::cold_snap; + creators["ice barrier"] = &MageAiObjectContextInternal::ice_barrier; + creators["summon_water_elemental"] = &MageAiObjectContextInternal::summon_water_elemental; creators["combustion"] = &MageAiObjectContextInternal::combustion; creators["ice block"] = &MageAiObjectContextInternal::ice_block; creators["polymorph"] = &MageAiObjectContextInternal::polymorph; @@ -183,7 +200,11 @@ class MageAiObjectContextInternal : public NamedObjectContext static Action* arcane_barrage(PlayerbotAI* botAI) { return new CastArcaneBarrageAction(botAI); } static Action* arcane_blast(PlayerbotAI* botAI) { return new CastArcaneBlastAction(botAI); } static Action* frostbolt(PlayerbotAI* botAI) { return new CastFrostboltAction(botAI); } + static Action* frostfire_bolt(PlayerbotAI* botAI) { return new CastFrostfireBoltAction(botAI); } + static Action* ice_lance(PlayerbotAI* botAI) { return new CastIceLanceAction(botAI); } + static Action* deep_freeze(PlayerbotAI* botAI) { return new CastDeepFreezeAction(botAI); } static Action* blizzard(PlayerbotAI* botAI) { return new CastBlizzardAction(botAI); } + static Action* cone_of_cold(PlayerbotAI* botAI) { return new CastConeOfColdAction(botAI); } static Action* frost_nova(PlayerbotAI* botAI) { return new CastFrostNovaAction(botAI); } static Action* arcane_intellect(PlayerbotAI* botAI) { return new CastArcaneIntellectAction(botAI); } static Action* arcane_intellect_on_party(PlayerbotAI* botAI) { return new CastArcaneIntellectOnPartyAction(botAI); } @@ -204,6 +225,9 @@ class MageAiObjectContextInternal : public NamedObjectContext static Action* remove_lesser_curse(PlayerbotAI* botAI) { return new CastRemoveLesserCurseAction(botAI); } static Action* remove_lesser_curse_on_party(PlayerbotAI* botAI) { return new CastRemoveLesserCurseOnPartyAction(botAI); } static Action* icy_veins(PlayerbotAI* botAI) { return new CastIcyVeinsAction(botAI); } + static Action* cold_snap(PlayerbotAI* botAI) { return new CastColdSnapAction(botAI); } + static Action* ice_barrier(PlayerbotAI* botAI) { return new CastIceBarrierAction(botAI); } + static Action* summon_water_elemental(PlayerbotAI* botAI) { return new CastSummonWaterElementalAction(botAI); } static Action* combustion(PlayerbotAI* botAI) { return new CastCombustionAction(botAI); } static Action* ice_block(PlayerbotAI* botAI) { return new CastIceBlockAction(botAI); } static Action* polymorph(PlayerbotAI* botAI) { return new CastPolymorphAction(botAI); } diff --git a/src/strategy/mage/MageTriggers.h b/src/strategy/mage/MageTriggers.h index 7bd776d9..e33a5f22 100644 --- a/src/strategy/mage/MageTriggers.h +++ b/src/strategy/mage/MageTriggers.h @@ -74,6 +74,24 @@ class ArcaneBlastTrigger : public BuffTrigger ArcaneBlastTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "arcane blast") { } }; +class FingersOfFrostSingleTrigger : public HasAuraStackTrigger +{ +public: + FingersOfFrostSingleTrigger(PlayerbotAI* ai) : HasAuraStackTrigger(ai, "fingers of frost", 1, 1) {} +}; + +class FingersOfFrostDoubleTrigger : public HasAuraStackTrigger +{ +public: + FingersOfFrostDoubleTrigger(PlayerbotAI* ai) : HasAuraStackTrigger(ai, "fingers of frost", 2, 1) {} +}; + +class BrainFreezeTrigger : public HasAuraTrigger +{ + public: + BrainFreezeTrigger(PlayerbotAI* botAI) : HasAuraTrigger(botAI, "fireball!") { } +}; + class CounterspellInterruptSpellTrigger : public InterruptSpellTrigger { public: @@ -92,6 +110,18 @@ class IcyVeinsTrigger : public BoostTrigger IcyVeinsTrigger(PlayerbotAI* botAI) : BoostTrigger(botAI, "icy veins") { } }; +class ColdSnapTrigger : public BoostTrigger +{ + public: + ColdSnapTrigger(PlayerbotAI* botAI) : BoostTrigger(botAI, "cold snap") { } +}; + +class IceBarrierTrigger : public BuffTrigger +{ + public: + IceBarrierTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "ice barrier") { } +}; + class PolymorphTrigger : public HasCcTargetTrigger { public: @@ -134,7 +164,8 @@ class PresenceOfMindTrigger : public BuffTrigger PresenceOfMindTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "presence of mind") { } }; -class ArcaneBlastStackTrigger : public HasAuraStackTrigger { +class ArcaneBlastStackTrigger : public HasAuraStackTrigger +{ public: ArcaneBlastStackTrigger(PlayerbotAI* ai) : HasAuraStackTrigger(ai, "arcane blast", 3, 1) {} };