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

Improve party member to heal and has aura to dispel check performance

Browse Source
This commit is contained in:
Yunfan Li
2024-08-05 15:45:37 +08:00
parent 72b32a1590
commit 8d77666624
5 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/PlayerbotAI.cpp
View File

@@ -3285,28 +3285,29 @@ bool PlayerbotAI::HasAuraToDispel(Unit* target, uint32 dispelType)
return false;
}
bool isFriend = bot->IsFriendlyTo(target);
for (uint32 type = SPELL_AURA_NONE; type < TOTAL_AURAS; ++type)
Unit::VisibleAuraMap const* visibleAuras = target->GetVisibleAuras();
for (Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr)
{
Unit::AuraEffectList const& auras = target->GetAuraEffectsByType((AuraType)type);
for (AuraEffect const* aurEff : auras)
{
Aura const* aura = aurEff->GetBase();
SpellInfo const* spellInfo = aura->GetSpellInfo();
Aura* aura = itr->second->GetBase();
bool isPositiveSpell = spellInfo->IsPositive();
if (isPositiveSpell && isFriend)
continue;
if (aura->IsPassive())
continue;
if (!isPositiveSpell && !isFriend)
continue;
if (sPlayerbotAIConfig->dispelAuraDuration && aura->GetDuration() &&
aura->GetDuration() < (int32)sPlayerbotAIConfig->dispelAuraDuration)
continue;
if (sPlayerbotAIConfig->dispelAuraDuration && aura->GetDuration() &&
aura->GetDuration() < (int32)sPlayerbotAIConfig->dispelAuraDuration)
continue;
SpellInfo const* spellInfo = aura->GetSpellInfo();
if (canDispel(spellInfo, dispelType))
return true;
}
bool isPositiveSpell = spellInfo->IsPositive();
if (isPositiveSpell && isFriend)
continue;
if (!isPositiveSpell && !isFriend)
continue;
if (canDispel(spellInfo, dispelType))
return true;
}
return false;
}

6
src/strategy/triggers/CureTriggers.cpp
View File

@@ -19,4 +19,10 @@ Value<Unit*>* PartyMemberNeedCureTrigger::GetTargetValue()
return context->GetValue<Unit*>("party member to dispel", dispelType);
}
bool PartyMemberNeedCureTrigger::IsActive()
{
Unit* target = GetTarget();
return target && target->IsInWorld();
}
bool NeedWorldBuffTrigger::IsActive() { return !WorldBuffAction::NeedWorldBuffs(bot).empty(); }

1
src/strategy/triggers/CureTriggers.h
View File

@@ -46,6 +46,7 @@ public:
}
Value<Unit*>* GetTargetValue() override;
bool IsActive() override;
};
class NeedWorldBuffTrigger : public Trigger

32
src/strategy/values/PartyMemberToHeal.cpp
View File

@@ -41,36 +41,54 @@ Unit* PartyMemberToHeal::Calculate()
for (GroupReference* gref = group->GetFirstMember(); gref; gref = gref->next())
{
Player* player = gref->GetSource();
if (player && Check(player) && player->IsAlive())
if (player && player->IsAlive())
{
uint8 health = player->GetHealthPct();
if (isRaid || health < sPlayerbotAIConfig->mediumHealth || !IsTargetOfSpellCast(player, predicate))
{
uint32 probeValue = 100;
if (player->GetDistance2d(bot) > sPlayerbotAIConfig->healDistance)
{
calc.probe(health + 30, player);
probeValue = health + 30;
}
else
{
calc.probe(health + player->GetDistance2d(bot) / 10, player);
probeValue = health + player->GetDistance2d(bot) / 10;
}
// delay Check player to here for better performance
if (probeValue < calc.minValue && Check(player))
{
calc.probe(probeValue, player);
}
}
}
Pet* pet = player->GetPet();
if (pet && Check(pet) && pet->IsAlive())
if (pet && pet->IsAlive())
{
uint8 health = ((Unit*)pet)->GetHealthPct();
uint32 probeValue = 100;
if (isRaid || health < sPlayerbotAIConfig->mediumHealth)
calc.probe(health + 30, pet);
probeValue = health + 30;
// delay Check pet to here for better performance
if (probeValue < calc.minValue && Check(pet))
{
calc.probe(probeValue, pet);
}
}
Unit* charm = player->GetCharm();
if (charm && Check(charm) && charm->IsAlive())
if (charm && charm->IsAlive())
{
uint8 health = charm->GetHealthPct();
uint32 probeValue = 100;
if (isRaid || health < sPlayerbotAIConfig->mediumHealth)
calc.probe(health, charm);
probeValue = health + 30;
// delay Check charm to here for better performance
if (probeValue < calc.minValue && Check(charm))
{
calc.probe(probeValue, charm);
}
}
}
return (Unit*)calc.param;

4
src/strategy/values/PartyMemberValue.cpp
View File

@@ -12,11 +12,11 @@ Unit* PartyMemberValue::FindPartyMember(std::vector<Player*>* party, FindPlayerP
{
for (Player* player : *party)
{
if (Check(player) && predicate.Check(player))
if (predicate.Check(player) && Check(player))
return player;
if (Pet* pet = player->GetPet())
if (Check(pet) && predicate.Check(pet))
if (predicate.Check(pet) && Check(pet))
return pet;
}