diff --git a/src/strategy/dungeons/wotlk/oculus/OculusActionContext.h b/src/strategy/dungeons/wotlk/oculus/OculusActionContext.h index fc22fdbb..fa5036e5 100644 --- a/src/strategy/dungeons/wotlk/oculus/OculusActionContext.h +++ b/src/strategy/dungeons/wotlk/oculus/OculusActionContext.h @@ -12,8 +12,8 @@ class WotlkDungeonOccActionContext : public NamedObjectContext creators["avoid unstable sphere"] = &WotlkDungeonOccActionContext::avoid_unstable_sphere; creators["mount drake"] = &WotlkDungeonOccActionContext::mount_drake; creators["dismount drake"] = &WotlkDungeonOccActionContext::dismount_drake; - creators["fly drake"] = &WotlkDungeonOccActionContext::fly_drake; - creators["drake attack"] = &WotlkDungeonOccActionContext::drake_attack; + creators["occ fly drake"] = &WotlkDungeonOccActionContext::occ_fly_drake; + creators["occ drake attack"] = &WotlkDungeonOccActionContext::occ_drake_attack; creators["avoid arcane explosion"] = &WotlkDungeonOccActionContext::avoid_arcane_explosion; creators["time bomb spread"] = &WotlkDungeonOccActionContext::time_bomb_spread; } @@ -21,8 +21,8 @@ class WotlkDungeonOccActionContext : public NamedObjectContext static Action* avoid_unstable_sphere(PlayerbotAI* ai) { return new AvoidUnstableSphereAction(ai); } static Action* mount_drake(PlayerbotAI* ai) { return new MountDrakeAction(ai); } static Action* dismount_drake(PlayerbotAI* ai) { return new DismountDrakeAction(ai); } - static Action* fly_drake(PlayerbotAI* ai) { return new OccFlyDrakeAction(ai); } - static Action* drake_attack(PlayerbotAI* ai) { return new OccDrakeAttackAction(ai); } + static Action* occ_fly_drake(PlayerbotAI* ai) { return new OccFlyDrakeAction(ai); } + static Action* occ_drake_attack(PlayerbotAI* ai) { return new OccDrakeAttackAction(ai); } static Action* avoid_arcane_explosion(PlayerbotAI* ai) { return new AvoidArcaneExplosionAction(ai); } static Action* time_bomb_spread(PlayerbotAI* ai) { return new TimeBombSpreadAction(ai); } }; diff --git a/src/strategy/dungeons/wotlk/oculus/OculusStrategy.cpp b/src/strategy/dungeons/wotlk/oculus/OculusStrategy.cpp index 9c1786b5..e64ede7a 100644 --- a/src/strategy/dungeons/wotlk/oculus/OculusStrategy.cpp +++ b/src/strategy/dungeons/wotlk/oculus/OculusStrategy.cpp @@ -15,9 +15,9 @@ void WotlkDungeonOccStrategy::InitTriggers(std::vector &triggers) triggers.push_back(new TriggerNode("drake dismount", NextAction::array(0, new NextAction("dismount drake", ACTION_RAID + 5), nullptr))); triggers.push_back(new TriggerNode("group flying", - NextAction::array(0, new NextAction("fly drake", ACTION_NORMAL + 1), nullptr))); + NextAction::array(0, new NextAction("occ fly drake", ACTION_NORMAL + 1), nullptr))); triggers.push_back(new TriggerNode("drake combat", - NextAction::array(0, new NextAction("drake attack", ACTION_NORMAL + 5), nullptr))); + NextAction::array(0, new NextAction("occ drake attack", ACTION_NORMAL + 5), nullptr))); // Varos Cloudstrider // Seems to be no way to identify the marked cores, may need to hook boss AI.. diff --git a/src/strategy/raids/eyeofeternity/RaidEoEActionContext.h b/src/strategy/raids/eyeofeternity/RaidEoEActionContext.h index ba4d841d..620610e9 100644 --- a/src/strategy/raids/eyeofeternity/RaidEoEActionContext.h +++ b/src/strategy/raids/eyeofeternity/RaidEoEActionContext.h @@ -14,8 +14,8 @@ public: creators["malygos target"] = &RaidEoEActionContext::target; // creators["pull power spark"] = &RaidEoEActionContext::pull_power_spark; // creators["kill power spark"] = &RaidEoEActionContext::kill_power_spark; - creators["fly drake"] = &RaidEoEActionContext::fly_drake; - creators["drake attack"] = &RaidEoEActionContext::drake_attack; + creators["eoe fly drake"] = &RaidEoEActionContext::eoe_fly_drake; + creators["eoe drake attack"] = &RaidEoEActionContext::eoe_drake_attack; } private: @@ -23,8 +23,8 @@ private: static Action* target(PlayerbotAI* ai) { return new MalygosTargetAction(ai); } // static Action* pull_power_spark(PlayerbotAI* ai) { return new PullPowerSparkAction(ai); } // static Action* kill_power_spark(PlayerbotAI* ai) { return new KillPowerSparkAction(ai); } - static Action* fly_drake(PlayerbotAI* ai) { return new EoEFlyDrakeAction(ai); } - static Action* drake_attack(PlayerbotAI* ai) { return new EoEDrakeAttackAction(ai); } + static Action* eoe_fly_drake(PlayerbotAI* ai) { return new EoEFlyDrakeAction(ai); } + static Action* eoe_drake_attack(PlayerbotAI* ai) { return new EoEDrakeAttackAction(ai); } }; #endif diff --git a/src/strategy/raids/eyeofeternity/RaidEoEStrategy.cpp b/src/strategy/raids/eyeofeternity/RaidEoEStrategy.cpp index f30cf30a..d06aa27f 100644 --- a/src/strategy/raids/eyeofeternity/RaidEoEStrategy.cpp +++ b/src/strategy/raids/eyeofeternity/RaidEoEStrategy.cpp @@ -14,9 +14,9 @@ void RaidEoEStrategy::InitTriggers(std::vector& triggers) // NextAction::array(0, new NextAction("kill power spark", ACTION_RAID + 3), nullptr))); triggers.push_back(new TriggerNode("group flying", - NextAction::array(0, new NextAction("fly drake", ACTION_NORMAL + 1), nullptr))); + NextAction::array(0, new NextAction("eoe fly drake", ACTION_NORMAL + 1), nullptr))); triggers.push_back(new TriggerNode("drake combat", - NextAction::array(0, new NextAction("drake attack", ACTION_NORMAL + 5), nullptr))); + NextAction::array(0, new NextAction("eoe drake attack", ACTION_NORMAL + 5), nullptr))); } void RaidEoEStrategy::InitMultipliers(std::vector &multipliers)