yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

miscs(triggers): spell range, fury warrior equip

Browse Source
This commit is contained in:
Yunfan Li
2023-06-11 21:15:02 +08:00
parent 617d0ee031
commit df43d7dff7
8 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/PlayerbotAI.cpp
View File

@@ -264,6 +264,7 @@ void PlayerbotAI::UpdateAI(uint32 elapsed, bool minimal)
UpdateAIInternal(elapsed, min);
inCombat = bot->IsInCombat();
// test fix lags because of BG
if (bot && !inCombat)
min = true;
@@ -3672,18 +3673,22 @@ Item* PlayerbotAI::FindStoneFor(Item* weapon) const
{
for (uint8 i = 0; i < std::size(uPriorizedSharpStoneIds); ++i)
{
if (stone = FindConsumable(uPriorizedSharpStoneIds[i]))
stone = FindConsumable(uPriorizedSharpStoneIds[i]);
if (stone) {
return stone;
}
}
}
else if (pProto && (pProto->SubClass == ITEM_SUBCLASS_WEAPON_MACE || pProto->SubClass == ITEM_SUBCLASS_WEAPON_MACE2))
{
for (uint8 i = 0; i < std::size(uPriorizedWeightStoneIds); ++i)
{
if (stone = FindConsumable(uPriorizedWeightStoneIds[i]))
stone = FindConsumable(uPriorizedWeightStoneIds[i]);
if (stone) {
return stone;
}
}
}
return stone;
}

1
src/PlayerbotFactory.cpp
View File

@@ -3007,6 +3007,7 @@ float PlayerbotFactory::CalculateItemScore(uint32 item_id)
((cls == CLASS_SHAMAN && tab == 1 && bot->HasSpell(674)) ||
(cls == CLASS_ROGUE) ||
(cls == CLASS_DEATH_KNIGHT && tab == 1) ||
(cls == CLASS_WARRIOR && tab == 1 && !bot->HasSpell(46917)) ||
IsShieldTank())) {
score *= 0.1;
}

17
src/strategy/druid/GenericDruidNonCombatStrategy.cpp
View File

@@ -15,6 +15,8 @@ class GenericDruidNonCombatStrategyActionNodeFactory : public NamedObjectFactory
creators["mark of the wild"] = &mark_of_the_wild;
creators["mark of the wild on party"] = &mark_of_the_wild_on_party;
// creators["innervate"] = &innervate;
creators["regrowth_on_party"] = &regrowth_on_party;
creators["rejuvenation on party"] = &rejuvenation_on_party;
}
private:
@@ -49,7 +51,20 @@ class GenericDruidNonCombatStrategyActionNodeFactory : public NamedObjectFactory
/*A*/ nullptr,
/*C*/ nullptr);
}
static ActionNode* regrowth_on_party(PlayerbotAI* ai)
{
return new ActionNode ("regrowth on party",
/*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
/*A*/ NULL,
/*C*/ NULL);
}
static ActionNode* rejuvenation_on_party(PlayerbotAI* ai)
{
return new ActionNode ("rejuvenation on party",
/*P*/ NextAction::array(0, new NextAction("caster form"), NULL),
/*A*/ NULL,
/*C*/ NULL);
}
// static ActionNode* innervate([[maybe_unused]] PlayerbotAI* botAI)
// {
// return new ActionNode ("innervate",

8
src/strategy/triggers/GenericTriggers.cpp
View File

@@ -60,14 +60,6 @@ bool ComboPointsAvailableTrigger::IsActive()
bool LoseAggroTrigger::IsActive()
{
// Unit* mt = AI_VALUE(Unit*, "main tank");
// if (mt) {
// botAI->TellMasterNoFacing("Has aggro: " + std::to_string(AI_VALUE2(bool, "has aggro", "current target"))
// + " My main tank is: " + mt->GetName());
// } else {
// botAI->TellMasterNoFacing("Has aggro: " + std::to_string(AI_VALUE2(bool, "has aggro", "current target"))
// + " No main tank detected");
// }
return !AI_VALUE2(bool, "has aggro", "current target");
}

16
src/strategy/triggers/RangeTriggers.cpp
View File

@@ -135,15 +135,15 @@ EnemyOutOfSpellRangeTrigger::EnemyOutOfSpellRangeTrigger(PlayerbotAI* botAI) : O
{
}
bool EnemyOutOfSpellRangeTrigger::IsActive()
{
Unit* target = AI_VALUE(Unit*, GetTargetName());
if (!target)
return false;
// bool EnemyOutOfSpellRangeTrigger::IsActive()
// {
// Unit* target = AI_VALUE(Unit*, GetTargetName());
// if (!target)
// return false;
float combatReach = bot->GetCombatReach() + target->GetCombatReach();
return target && (sServerFacade->GetDistance2d(bot, target) > (distance + combatReach + sPlayerbotAIConfig->contactDistance) || !bot->IsWithinLOSInMap(target));
}
// float combatReach = bot->GetCombatReach() + target->GetCombatReach();
// return target && (sServerFacade->GetDistance2d(bot, target) > (distance + combatReach + sPlayerbotAIConfig->contactDistance) || !bot->IsWithinLOSInMap(target));
// }
// bool EnemyOutOfMeleeTrigger::IsActive()
// {

2
src/strategy/triggers/RangeTriggers.h
View File

@@ -74,8 +74,6 @@ class EnemyOutOfSpellRangeTrigger : public OutOfRangeTrigger
{
public:
EnemyOutOfSpellRangeTrigger(PlayerbotAI* botAI);
bool IsActive() override;
};
class PartyMemberToHealOutOfSpellRangeTrigger : public OutOfRangeTrigger

8
src/strategy/values/AttackerCountValues.cpp
View File

@@ -26,10 +26,10 @@ bool HasAggroValue::Calculate()
return true;
}
botAI->TellMaster("target: " + target->GetName() + " victim: " + victim->GetName());
if (victim->ToPlayer() ) {
botAI->TellMaster("victim is mt: " + std::to_string(botAI->IsMainTank(victim->ToPlayer())));
}
// botAI->TellMaster("target: " + target->GetName() + " victim: " + victim->GetName());
// if (victim->ToPlayer() ) {
// botAI->TellMaster("victim is mt: " + std::to_string(botAI->IsMainTank(victim->ToPlayer())));
// }
return false;
// HostileReference *ref = bot->getHostileRefMgr().getFirst();
// if (!ref)

2
src/strategy/values/PartyMemberValue.h
View File

@@ -25,7 +25,7 @@ class SpellEntryPredicate
class PartyMemberValue : public UnitCalculatedValue
{
public:
PartyMemberValue(PlayerbotAI* botAI, std::string const name = "party member") : UnitCalculatedValue(botAI, name) { }
PartyMemberValue(PlayerbotAI* botAI, std::string const name = "party member", int checkInterval = 1) : UnitCalculatedValue(botAI, name, checkInterval) { }
bool IsTargetOfSpellCast(Player* target, SpellEntryPredicate& predicate);