nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-01-15 18:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'liyunfan1223:master' into bot_questing

Browse Source
This commit is contained in:
Atidote
2024-08-05 17:58:30 +02:00
committed by GitHub
parent 85b937855f 87640727a2
commit de304de6dd
12 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
}