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

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

37
src/PlayerbotAI.cpp
View File

@@ -1567,7 +1567,7 @@ bool PlayerbotAI::ContainsStrategy(StrategyType type)
{
for (uint8 i = 0; i < BOT_STATE_MAX; i++)
{
if (engines[i]->ContainsStrategy(type))
if (engines[i]->HasStrategyType(type))
return true;
}
@@ -3671,28 +3671,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;
}

2
src/strategy/Engine.cpp
View File

@@ -86,6 +86,7 @@ Engine::~Engine(void)
void Engine::Reset()
{
strategyTypeMask = 0;
ActionNode* action = nullptr;
do
{
@@ -120,6 +121,7 @@ void Engine::Init()
for (std::map<std::string, Strategy*>::iterator i = strategies.begin(); i != strategies.end(); i++)
{
Strategy* strategy = i->second;
strategyTypeMask |= strategy->GetType();
strategy->InitMultipliers(multipliers);
strategy->InitTriggers(triggers);

3
src/strategy/Engine.h
View File

@@ -83,7 +83,7 @@ public:
void AddActionExecutionListener(ActionExecutionListener* listener) { actionExecutionListeners.Add(listener); }
void removeActionExecutionListener(ActionExecutionListener* listener) { actionExecutionListeners.Remove(listener); }
bool HasStrategyType(StrategyType type) { return strategyTypeMask & type; }
virtual ~Engine(void);
bool testMode;
@@ -112,6 +112,7 @@ protected:
std::map<std::string, Strategy*> strategies;
float lastRelevance;
std::string lastAction;
uint32 strategyTypeMask;
};
#endif

4
src/strategy/hunter/GenericHunterStrategy.cpp
View File

@@ -98,7 +98,9 @@ void GenericHunterStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
new TriggerNode("misdirection on main tank",
NextAction::array(0, new NextAction("misdirection on main tank", ACTION_HIGH + 7), NULL)));
triggers.push_back(
new TriggerNode("tranquilizing shot", NextAction::array(0, new NextAction("tranquilizing shot", 61.0f), NULL)));
new TriggerNode("tranquilizing shot enrage", NextAction::array(0, new NextAction("tranquilizing shot", 61.0f), NULL)));
triggers.push_back(
new TriggerNode("tranquilizing shot magic", NextAction::array(0, new NextAction("tranquilizing shot", 61.0f), NULL)));
}
NextAction** HunterBoostStrategy::getDefaultActions()

4
src/strategy/hunter/HunterAiObjectContext.cpp
View File

@@ -85,7 +85,8 @@ public:
creators["switch to melee"] = &HunterTriggerFactoryInternal::switch_to_melee;
creators["switch to ranged"] = &HunterTriggerFactoryInternal::switch_to_ranged;
creators["misdirection on main tank"] = &HunterTriggerFactoryInternal::misdirection_on_main_tank;
creators["tranquilizing shot"] = &HunterTriggerFactoryInternal::remove_enrage;
creators["tranquilizing shot enrage"] = &HunterTriggerFactoryInternal::remove_enrage;
creators["tranquilizing shot magic"] = &HunterTriggerFactoryInternal::remove_magic;
}
private:
@@ -118,6 +119,7 @@ private:
static Trigger* switch_to_ranged(PlayerbotAI* botAI) { return new SwitchToRangedTrigger(botAI); }
static Trigger* misdirection_on_main_tank(PlayerbotAI* ai) { return new MisdirectionOnMainTankTrigger(ai); }
static Trigger* remove_enrage(PlayerbotAI* ai) { return new TargetRemoveEnrageTrigger(ai); }
static Trigger* remove_magic(PlayerbotAI* ai) { return new TargetRemoveMagicTrigger(ai); }
};
class HunterAiObjectContextInternal : public NamedObjectContext<Action>

6
src/strategy/hunter/HunterTriggers.cpp
View File

@@ -88,9 +88,3 @@ bool SwitchToMeleeTrigger::IsActive()
(target->GetVictim() == bot &&
sServerFacade->IsDistanceLessOrEqualThan(AI_VALUE2(float, "distance", "current target"), 8.0f));
}
bool TargetRemoveEnrageTrigger::IsActive()
{
Unit* target = GetTarget();
return target && (botAI->HasAuraToDispel(target, DISPEL_ENRAGE) || botAI->HasAuraToDispel(target, DISPEL_MAGIC));
}

7
src/strategy/hunter/HunterTriggers.h
View File

@@ -170,6 +170,11 @@ class TargetRemoveEnrageTrigger : public TargetAuraDispelTrigger
{
public:
TargetRemoveEnrageTrigger(PlayerbotAI* ai) : TargetAuraDispelTrigger(ai, "tranquilizing shot", DISPEL_ENRAGE) {}
bool IsActive() override;
};
class TargetRemoveMagicTrigger : public TargetAuraDispelTrigger
{
public:
TargetRemoveMagicTrigger(PlayerbotAI* ai) : TargetAuraDispelTrigger(ai, "tranquilizing shot", DISPEL_MAGIC) {}
};
#endif

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