Skip to content

Bot priority 2 fixes #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Velite12 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −5
Open

Bot priority 2 fixes #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions playerbot/strategy/actions/MovementActions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2817,8 +2817,9 @@ bool MovementAction::Flee(Unit *target)
time_t now = time(0);
uint32 fleeDelay = urand(2, sPlayerbotAIConfig.returnDelay / 1000);

// let hunter kite mob
if (isTarget && bot->getClass() == CLASS_HUNTER)
// let hunter/kiter kite mob
if (isTarget && (bot->getClass() == CLASS_HUNTER || ai->HasStrategy("kite", BotState::BOT_STATE_COMBAT)
|| ai->HasStrategy("kite", BotState::BOT_STATE_REACTION)))
{
fleeDelay = 1;
}
Expand Down
12 changes: 12 additions & 0 deletions playerbot/strategy/paladin/ProtectionPaladinStrategy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ void ProtectionPaladinStrategy::InitCombatTriggers(std::list<TriggerNode*>& trig
"lose aggro",
NextAction::array(0, new NextAction("hand of reckoning", ACTION_MOVE), NULL)));

triggers.push_back(new TriggerNode(
"protect party member",
NextAction::array(0, new NextAction("blessing of protection on party", ACTION_CRITICAL_HEAL), NULL)));

triggers.push_back(new TriggerNode(
"holy shield",
NextAction::array(0, new NextAction("holy shield", ACTION_HIGH + 3), NULL)));
Expand Down Expand Up @@ -575,6 +579,10 @@ void ProtectionPaladinStrategy::InitCombatTriggers(std::list<TriggerNode*>& trig
"lose aggro",
NextAction::array(0, new NextAction("righteous defense", ACTION_MOVE), NULL)));

triggers.push_back(new TriggerNode(
"protect party member",
NextAction::array(0, new NextAction("blessing of protection on party", ACTION_CRITICAL_HEAL), NULL)));

triggers.push_back(new TriggerNode(
"holy shield",
NextAction::array(0, new NextAction("holy shield", ACTION_HIGH + 3), NULL)));
Expand Down Expand Up @@ -1082,6 +1090,10 @@ void ProtectionPaladinStrategy::InitCombatTriggers(std::list<TriggerNode*>& trig
"lose aggro",
NextAction::array(0, new NextAction("hand of reckoning", ACTION_MOVE), NULL)));

triggers.push_back(new TriggerNode(
"protect party member",
NextAction::array(0, new NextAction("blessing of protection on party", ACTION_CRITICAL_HEAL), NULL)));

triggers.push_back(new TriggerNode(
"holy shield",
NextAction::array(0, new NextAction("holy shield", ACTION_HIGH + 3), NULL)));
Expand Down
2 changes: 1 addition & 1 deletion playerbot/strategy/warlock/WarlockStrategy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ void WarlockStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
NextAction::array(0, new NextAction("sacrifice", ACTION_EMERGENCY), NULL)));

triggers.push_back(new TriggerNode(
"life tap",
"medium mana",
NextAction::array(0, new NextAction("life tap", ACTION_HIGH + 3), NULL)));

triggers.push_back(new TriggerNode(
Expand Down
2 changes: 1 addition & 1 deletion playerbot/strategy/warrior/ArmsWarriorStrategy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ArmsWarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNod

ACTION_NODE_A(death_wish, "death wish", "bloodrage");

ACTION_NODE_A(piercing_howl, "piercing howl", "mocking blow");
ACTION_NODE_A(piercing_howl, "piercing howl", "hamstring");

ACTION_NODE_A(mocking_blow, "mocking blow", "hamstring");

Expand Down
2 changes: 1 addition & 1 deletion playerbot/strategy/warrior/ProtectionWarriorStrategy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ProtectionWarriorStrategyActionNodeFactory : public NamedObjectFactory<Act

ACTION_NODE_A(heroic_throw_taunt, "heroic throw", "taunt");

ACTION_NODE_A(taunt, "taunt", "battle shout taunt");
ACTION_NODE_A(taunt, "taunt", "mocking blow");

ACTION_NODE_A(berserker_rage_fear, "berserker rage", "death wish");
};
Expand Down