nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-02-14 23:56:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(spell): paladin and dk aggro spell, warrior

Browse Source
This commit is contained in:
Yunfan Li
2023-06-11 15:55:36 +08:00
parent b11fad1a46
commit 33576bd969
21 changed files with 117 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/strategy/druid/BearTankDruidStrategy.cpp
View File

@@ -77,7 +77,8 @@ class BearTankDruidStrategyActionNodeFactory : public NamedObjectFactory<ActionN
{
return new ActionNode ("mangle (bear)",
/*P*/ nullptr,
/*A*/ NextAction::array(0, new NextAction("lacerate"), nullptr),
// /*A*/ NextAction::array(0, new NextAction("lacerate"), nullptr),
nullptr,
/*C*/ nullptr);
}
@@ -138,10 +139,10 @@ BearTankDruidStrategy::BearTankDruidStrategy(PlayerbotAI* botAI) : FeralDruidStr
NextAction** BearTankDruidStrategy::getDefaultActions()
{
return NextAction::array(0,
new NextAction("lacerate", ACTION_NORMAL + 4),
new NextAction("mangle (bear)", ACTION_NORMAL + 3),
new NextAction("mangle (bear)", ACTION_NORMAL + 5),
new NextAction("faerie fire (feral)", ACTION_NORMAL + 4),
new NextAction("lacerate", ACTION_NORMAL + 3),
new NextAction("maul", ACTION_NORMAL + 2),
new NextAction("faerie fire (feral)", ACTION_NORMAL + 1),
new NextAction("melee", ACTION_NORMAL),
nullptr);
}

4
src/strategy/druid/DruidActions.h
View File

@@ -17,10 +17,10 @@ class CastFaerieFireAction : public CastDebuffSpellAction
CastFaerieFireAction(PlayerbotAI* botAI) : CastDebuffSpellAction(botAI, "faerie fire") { }
};
class CastFaerieFireFeralAction : public CastDebuffSpellAction
class CastFaerieFireFeralAction : public CastSpellAction
{
public:
CastFaerieFireFeralAction(PlayerbotAI* botAI) : CastDebuffSpellAction(botAI, "faerie fire (feral)") { }
CastFaerieFireFeralAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "faerie fire (feral)") { }
};
class CastRejuvenationAction : public CastHealingSpellAction

2
src/strategy/druid/DruidShapeshiftActions.cpp
View File

@@ -41,6 +41,6 @@ bool CastCasterFormAction::Execute(Event event)
}
bool CastTreeFormAction::isUseful() {
return GetTarget() && (GetTarget() != nullptr) && (GetTarget() != nullptr) &&
return GetTarget() &&
CastSpellAction::isUseful() && !botAI->HasAura(33891, bot);
}

2
src/strategy/druid/FeralDruidStrategy.cpp
View File

@@ -101,8 +101,6 @@ void FeralDruidStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
triggers.push_back(new TriggerNode("enemy too close for melee", NextAction::array(0, new NextAction("move out of enemy contact", ACTION_NORMAL + 8), nullptr)));
triggers.push_back(new TriggerNode("critical health", NextAction::array(0, new NextAction("survival instincts", ACTION_EMERGENCY + 1), nullptr)));
triggers.push_back(new TriggerNode("omen of clarity", NextAction::array(0, new NextAction("omen of clarity", ACTION_HIGH + 9), nullptr)));
//triggers.push_back(new TriggerNode("player has no flag", NextAction::array(0, new NextAction("prowl", ACTION_HIGH + 1), nullptr)));
//triggers.push_back(new TriggerNode("enemy out of melee", NextAction::array(0, new NextAction("prowl", ACTION_INTERRUPT + 1), nullptr)));
triggers.push_back(new TriggerNode("player has flag", NextAction::array(0, new NextAction("dash", ACTION_EMERGENCY + 2), nullptr)));
triggers.push_back(new TriggerNode("enemy flagcarrier near", NextAction::array(0, new NextAction("dash", ACTION_EMERGENCY + 2), nullptr)));
}