diff --git a/src/strategy/mage/FrostMageStrategy.cpp b/src/strategy/mage/FrostMageStrategy.cpp index 39822aa12..4898b1ad2 100644 --- a/src/strategy/mage/FrostMageStrategy.cpp +++ b/src/strategy/mage/FrostMageStrategy.cpp @@ -5,15 +5,60 @@ #include "FrostMageStrategy.h" #include "Playerbots.h" +class FrostMageStrategyActionNodeFactory : public NamedObjectFactory +{ +public: + FrostMageStrategyActionNodeFactory() + { + creators["cold snap"] = &cold_snap; + creators["ice barrier"] = &ice_barrier; + creators["summon water elemental"] = &summon_water_elemental; + creators["deep freeze"] = &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); + } +}; + 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 +66,38 @@ 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", ACTION_HIGH), nullptr))); + triggers.push_back(new TriggerNode("has pet", NextAction::array(0, new NextAction("toggle pet spell", ACTION_HIGH + 1), nullptr))); + triggers.push_back(new TriggerNode("ice barrier", NextAction::array(0, new NextAction("ice barrier", ACTION_NORMAL), nullptr))); + + triggers.push_back(new TriggerNode("brain freeze", NextAction::array(0, new NextAction("frostfire bolt", ACTION_NORMAL + 3), nullptr))); + // Combo cast the last charge of fingers of frost for double crits. + // Should only do this on the final charge of FoF. + triggers.push_back(new TriggerNode("fingers of frost single", NextAction::array(0, + new NextAction("frostbolt", ACTION_NORMAL + 2), + new NextAction("deep freeze", ACTION_NORMAL + 1), + 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", ACTION_NORMAL), nullptr))); + + // Same 2-spell combo for various freeze procs + triggers.push_back(new TriggerNode("frost nova on target", NextAction::array(0, + new NextAction("frostbolt", ACTION_NORMAL + 2), + new NextAction("deep freeze", ACTION_NORMAL + 1), + nullptr))); + triggers.push_back(new TriggerNode("frostbite on target", NextAction::array(0, + new NextAction("frostbolt", ACTION_NORMAL + 2), + new NextAction("deep freeze", ACTION_NORMAL + 1), + 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", ACTION_HIGH), nullptr))); + triggers.push_back(new TriggerNode("light aoe", NextAction::array(0, new NextAction("cone of cold", ACTION_HIGH + 1), nullptr))); } diff --git a/src/strategy/mage/GenericMageStrategy.cpp b/src/strategy/mage/GenericMageStrategy.cpp index e6bff447d..682ddfb4c 100644 --- a/src/strategy/mage/GenericMageStrategy.cpp +++ b/src/strategy/mage/GenericMageStrategy.cpp @@ -12,9 +12,12 @@ class GenericMageStrategyActionNodeFactory : public NamedObjectFactoryIsDistanceLessOrEqualThan(AI_VALUE2(float, "distance", GetTargetName()), 10.f); } + +bool CastConeOfColdAction::isUseful() +{ + bool facingTarget = AI_VALUE2(bool, "facing", "current target"); + bool targetClose = sServerFacade->IsDistanceLessOrEqualThan(AI_VALUE2(float, "distance", GetTargetName()), 10.f); + return facingTarget && targetClose; +} diff --git a/src/strategy/mage/MageActions.h b/src/strategy/mage/MageActions.h index 1303498ab..a9ae6ff9d 100644 --- a/src/strategy/mage/MageActions.h +++ b/src/strategy/mage/MageActions.h @@ -35,7 +35,6 @@ class CastArcaneBlastAction : public CastBuffSpellAction { public: CastArcaneBlastAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "arcane blast") { } - std::string const GetTargetName() override { return "current target"; } }; @@ -68,7 +67,6 @@ class CastFrostNovaAction : public CastSpellAction { public: CastFrostNovaAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "frost nova") { } - bool isUseful() override; }; @@ -78,12 +76,37 @@ class CastFrostboltAction : public CastSpellAction CastFrostboltAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "frostbolt") { } }; +class CastFrostfireBoltAction : public CastSpellAction +{ + public: + CastFrostfireBoltAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "frostfire bolt") { } +}; + +class CastIceLanceAction : public CastSpellAction +{ + public: + CastIceLanceAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "ice lance") { } +}; + +class CastDeepFreezeAction : public CastSpellAction +{ + public: + CastDeepFreezeAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "deep freeze") { } +}; + class CastBlizzardAction : public CastSpellAction { public: CastBlizzardAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "blizzard") { } + ActionThreatType getThreatType() override { return ActionThreatType::Aoe; } +}; +class CastConeOfColdAction : public CastSpellAction +{ + public: + CastConeOfColdAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "cone of cold") { } ActionThreatType getThreatType() override { return ActionThreatType::Aoe; } + bool isUseful() override; }; class CastArcaneIntellectAction : public CastBuffSpellAction @@ -116,6 +139,24 @@ class CastIcyVeinsAction : public CastBuffSpellAction CastIcyVeinsAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "icy veins") { } }; +class CastColdSnapAction : public CastBuffSpellAction +{ + public: + CastColdSnapAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "cold snap") { } +}; + +class CastIceBarrierAction : public CastBuffSpellAction +{ + public: + CastIceBarrierAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "ice barrier") { } +}; + +class CastSummonWaterElementalAction : public CastBuffSpellAction +{ + public: + CastSummonWaterElementalAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "summon water elemental") { } +}; + class CastCombustionAction : public CastBuffSpellAction { public: @@ -183,7 +224,6 @@ class CastPolymorphAction : public CastBuffSpellAction { public: CastPolymorphAction(PlayerbotAI* botAI) : CastBuffSpellAction(botAI, "polymorph") { } - Value* 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 671ea97eb..8e8af0b11 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; @@ -99,6 +104,8 @@ class MageTriggerFactoryInternal : public NamedObjectContext creators["frost ward"] = &MageTriggerFactoryInternal::frost_ward; creators["arcane blast stack"] = &MageTriggerFactoryInternal::arcane_blast_stack; creators["mirror image"] = &MageTriggerFactoryInternal::mirror_image; + creators["frost nova on target"] = &MageTriggerFactoryInternal::frost_nova_on_target; + creators["frostbite on target"] = &MageTriggerFactoryInternal::frostbite_on_target; } private: @@ -110,7 +117,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); } @@ -125,6 +137,8 @@ class MageTriggerFactoryInternal : public NamedObjectContext static Trigger* counterspell_enemy_healer(PlayerbotAI* botAI) { return new CounterspellEnemyHealerTrigger(botAI); } static Trigger* arcane_blast_stack(PlayerbotAI* botAI) { return new ArcaneBlastStackTrigger(botAI); } static Trigger* mirror_image(PlayerbotAI* botAI) { return new MirrorImageTrigger(botAI); } + static Trigger* frost_nova_on_target(PlayerbotAI* botAI) { return new FrostNovaOnTargetTrigger(botAI); } + static Trigger* frostbite_on_target(PlayerbotAI* botAI) { return new FrostbiteOnTargetTrigger(botAI); } }; class MageAiObjectContextInternal : public NamedObjectContext @@ -135,7 +149,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 +174,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 +204,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 +229,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.cpp b/src/strategy/mage/MageTriggers.cpp index b8023a514..72bea2070 100644 --- a/src/strategy/mage/MageTriggers.cpp +++ b/src/strategy/mage/MageTriggers.cpp @@ -21,3 +21,29 @@ bool MageArmorTrigger::IsActive() Unit* target = GetTarget(); return !botAI->HasAura("ice armor", target) && !botAI->HasAura("frost armor", target) && !botAI->HasAura("molten armor", target) && !botAI->HasAura("mage armor", target); } + +bool FingersOfFrostSingleTrigger::IsActive() +{ + // Fingers of Frost "stack" count is always 1. + // The value is instead stored in the charges. + Aura *aura = botAI->GetAura(getName(), GetTarget(), false, true, -1); + return (aura && aura->GetCharges() == 1); +} + +bool FrostNovaOnTargetTrigger::IsActive() +{ + Unit* target = GetTarget(); + if (!target || !target->IsAlive() || !target->IsInWorld()) { + return false; + } + return botAI->HasAura(spell, target); +} + +bool FrostbiteOnTargetTrigger::IsActive() +{ + Unit* target = GetTarget(); + if (!target || !target->IsAlive() || !target->IsInWorld()) { + return false; + } + return botAI->HasAura(spell, target); +} diff --git a/src/strategy/mage/MageTriggers.h b/src/strategy/mage/MageTriggers.h index 7bd776d95..111ba341d 100644 --- a/src/strategy/mage/MageTriggers.h +++ b/src/strategy/mage/MageTriggers.h @@ -26,7 +26,6 @@ class ArcaneIntellectTrigger : public BuffTrigger { public: ArcaneIntellectTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "arcane intellect", 2 * 2000) { } - bool IsActive() override; }; @@ -34,7 +33,6 @@ class MageArmorTrigger : public BuffTrigger { public: MageArmorTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "mage armor", 5 * 2000) { } - bool IsActive() override; }; @@ -74,6 +72,26 @@ 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) {} + bool IsActive() override; +}; + +class FingersOfFrostDoubleTrigger : public HasAuraStackTrigger +{ +public: + FingersOfFrostDoubleTrigger(PlayerbotAI* ai) : HasAuraStackTrigger(ai, "fingers of frost", 2, 1) {} + // bool IsActive() override; +}; + +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,15 +164,30 @@ 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) {} + ArcaneBlastStackTrigger(PlayerbotAI* botAI) : HasAuraStackTrigger(botAI, "arcane blast", 3, 1) {} +}; + +class MirrorImageTrigger : public BoostTrigger +{ + public: + MirrorImageTrigger(PlayerbotAI* botAI) : BoostTrigger(botAI, "mirror image") {} +}; + +class FrostNovaOnTargetTrigger : public DebuffTrigger +{ + public: + FrostNovaOnTargetTrigger(PlayerbotAI* botAI) : DebuffTrigger(botAI, "frost nova", 1, false) {} + bool IsActive() override; }; -class MirrorImageTrigger : public BoostTrigger +class FrostbiteOnTargetTrigger : public DebuffTrigger { public: - MirrorImageTrigger(PlayerbotAI* ai) : BoostTrigger(ai, "mirror image") {} + FrostbiteOnTargetTrigger(PlayerbotAI* botAI) : DebuffTrigger(botAI, "frostbite", 1, false) {} + bool IsActive() override; }; #endif