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

Pet attack (fix shadowfiend)

Browse Source
This commit is contained in:
Yunfan Li
2024-02-08 00:36:16 +08:00
parent 5e2497bf7e
commit 9e78a0b36a
11 changed files with 95 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/strategy/actions/ActionContext.h
View File

@@ -225,7 +225,7 @@ class ActionContext : public NamedObjectContext<Action>
creators["rpg mount anim"] = &ActionContext::rpg_mount_anim;
creators["toggle pet spell"] = &ActionContext::toggle_pet_spell;
creators["pet attack"] = &ActionContext::pet_attack;
}
@@ -390,7 +390,7 @@ class ActionContext : public NamedObjectContext<Action>
static Action* rpg_mount_anim(PlayerbotAI* botAI) { return new RpgMountAnimAction(botAI); }
static Action* toggle_pet_spell(PlayerbotAI* ai) { return new TogglePetSpellAutoCastAction(ai); }
static Action* pet_attack(PlayerbotAI* ai) { return new PetAttackAction(ai); }
};

32
src/strategy/actions/AttackAction.cpp
View File

@@ -116,22 +116,22 @@ bool AttackAction::Attack(Unit* target, bool with_pet /*true*/)
return false;
}
/* prevent pet dead immediately in group */
if (bot->GetMap()->IsDungeon() && bot->GetGroup() && !target->IsInCombat()) {
with_pet = false;
}
if (Pet* pet = bot->GetPet())
{
if (with_pet) {
pet->SetReactState(REACT_DEFENSIVE);
pet->SetTarget(target->GetGUID());
pet->GetCharmInfo()->SetIsCommandAttack(true);
pet->AI()->AttackStart(target);
} else {
pet->SetReactState(REACT_PASSIVE);
pet->GetCharmInfo()->SetIsCommandFollow(true);
pet->GetCharmInfo()->IsReturning();
}
}
// if (bot->GetMap()->IsDungeon() && bot->GetGroup() && !target->IsInCombat()) {
// with_pet = false;
// }
// if (Pet* pet = bot->GetPet())
// {
// if (with_pet) {
// pet->SetReactState(REACT_DEFENSIVE);
// pet->SetTarget(target->GetGUID());
// pet->GetCharmInfo()->SetIsCommandAttack(true);
// pet->AI()->AttackStart(target);
// } else {
// pet->SetReactState(REACT_PASSIVE);
// pet->GetCharmInfo()->SetIsCommandFollow(true);
// pet->GetCharmInfo()->IsReturning();
// }
// }
return true;
}

26
src/strategy/actions/GenericActions.cpp
View File

@@ -3,6 +3,7 @@
*/
#include "GenericActions.h"
#include "CreatureAI.h"
#include "Playerbots.h"
bool MeleeAction::isUseful()
@@ -39,4 +40,29 @@ bool TogglePetSpellAutoCastAction::Execute(Event event) {
}
}
return true;
}
bool PetAttackAction::Execute(Event event)
{
Guardian* pet = bot->GetGuardianPet();
if (!pet) {
return false;
}
Unit* target = AI_VALUE(Unit*, "current target");
if (!target) {
return false;
}
// pet->SetReactState(REACT_DEFENSIVE);
pet->ClearUnitState(UNIT_STATE_FOLLOW);
pet->AttackStop();
pet->SetTarget(target->GetGUID());
pet->GetCharmInfo()->SetIsCommandAttack(true);
pet->GetCharmInfo()->SetIsAtStay(false);
pet->GetCharmInfo()->SetIsFollowing(false);
pet->GetCharmInfo()->SetIsCommandFollow(false);
pet->GetCharmInfo()->SetIsReturning(false);
pet->ToCreature()->AI()->AttackStart(target);
return true;
}

8
src/strategy/actions/GenericActions.h
View File

@@ -25,4 +25,12 @@ public:
virtual bool Execute(Event event) override;
};
class PetAttackAction: public Action
{
public:
PetAttackAction(PlayerbotAI* ai): Action(ai, "pet attack") {}
virtual bool Execute(Event event) override;
};
#endif

1
src/strategy/generic/CombatStrategy.cpp
View File

@@ -13,6 +13,7 @@ void CombatStrategy::InitTriggers(std::vector<TriggerNode*> &triggers)
// triggers.push_back(new TriggerNode("out of react range", NextAction::array(0, new NextAction("flee to master", 55), nullptr)));
triggers.push_back(new TriggerNode("combat stuck", NextAction::array(0, new NextAction("reset", 1.0f), nullptr)));
triggers.push_back(new TriggerNode("not facing target", NextAction::array(0, new NextAction("set facing", ACTION_MOVE + 7), nullptr)));
triggers.push_back(new TriggerNode("pet attack", NextAction::array(0, new NextAction("pet attack", ACTION_NORMAL), nullptr)));
// triggers.push_back(new TriggerNode("combat long stuck", NextAction::array(0, new NextAction("hearthstone", 0.9f), new NextAction("repop", 0.8f), nullptr)));
}

1
src/strategy/priest/GenericPriestStrategy.cpp
View File

@@ -45,7 +45,6 @@ void GenericPriestStrategy::InitTriggers(std::vector<TriggerNode*>& triggers)
NextAction::array(0, new NextAction("hymn of hope", ACTION_HIGH), NULL)));
triggers.push_back(new TriggerNode("enemy too close for spell", NextAction::array(0, new NextAction("flee", ACTION_MOVE + 9), nullptr)));
triggers.push_back(new TriggerNode("often", NextAction::array(0, new NextAction("apply oil", 1.0f), nullptr)));
}

10
src/strategy/raids/naxxramas/RaidNaxxMultipliers.cpp
View File

@@ -1,4 +1,5 @@
#include "RaidNaxxMultipliers.h"
#include "GenericActions.h"
#include "MovementActions.h"
#include "ScriptedCreature.h"
#include "RaidNaxxActions.h"
@@ -173,7 +174,8 @@ float KelthuzadGenericMultiplier::GetValue(Action* action)
dynamic_cast<CastRaiseDeadAction*>(action) ||
dynamic_cast<CastFeignDeathAction*>(action) ||
dynamic_cast<CastInvisibilityAction*>(action) ||
dynamic_cast<CastVanishAction*>(action)) {
dynamic_cast<CastVanishAction*>(action) ||
dynamic_cast<PetAttackAction*>(action)) {
return 0.0f;
}
}
@@ -268,5 +270,11 @@ float GluthGenericMultiplier::GetValue(Action* action)
}
}
}
if (dynamic_cast<PetAttackAction*>(action)) {
Unit* target = AI_VALUE(Unit*, "current target");
if (target && target->GetEntry() == NPC_ZOMBIE_CHOW) {
return 0.0f;
}
}
return 1.0f;
}

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

@@ -4,6 +4,7 @@
#include "GenericTriggers.h"
#include "BattlegroundWS.h"
#include "CreatureAI.h"
#include "ObjectGuid.h"
#include "Playerbots.h"
#include "SharedDefines.h"
@@ -34,6 +35,25 @@ bool HasPetTrigger::IsActive() {
return (AI_VALUE(Unit*, "pet target")) && !AI_VALUE2(bool, "mounted", "self target");;
}
bool PetAttackTrigger::IsActive()
{
Guardian* pet = bot->GetGuardianPet();
if (!pet) {
return false;
}
Unit* target = AI_VALUE(Unit*, "current target");
if (!target) {
return false;
}
if (pet->GetVictim() == target && pet->GetCharmInfo()->IsCommandAttack()) {
return false;
}
if (bot->GetMap()->IsDungeon() && bot->GetGroup() && !target->IsInCombat()) {
return false;
}
return true;
}
bool HighManaTrigger::IsActive()
{
return AI_VALUE2(bool, "has mana", "self target") && AI_VALUE2(uint8, "mana", "self target") < 65;

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

@@ -453,6 +453,14 @@ public:
virtual bool IsActive() override;
};
class PetAttackTrigger : public Trigger
{
public:
PetAttackTrigger(PlayerbotAI* ai) : Trigger(ai, "pet attack") {}
virtual bool IsActive() override;
};
class ItemCountTrigger : public Trigger
{
public:

3
src/strategy/triggers/TriggerContext.h
View File

@@ -101,6 +101,8 @@ class TriggerContext : public NamedObjectContext<Trigger>
creators["combat party member dead"] = &TriggerContext::CombatPartyMemberDead;
creators["no pet"] = &TriggerContext::no_pet;
creators["has pet"] = &TriggerContext::has_pet;
creators["pet attack"] = &TriggerContext::pet_attack;
creators["has attackers"] = &TriggerContext::has_attackers;
creators["no possible targets"] = &TriggerContext::no_possible_targets;
creators["possible adds"] = &TriggerContext::possible_adds;
@@ -289,6 +291,7 @@ class TriggerContext : public NamedObjectContext<Trigger>
static Trigger* protect_party_member(PlayerbotAI* botAI) { return new ProtectPartyMemberTrigger(botAI); }
static Trigger* no_pet(PlayerbotAI* botAI) { return new NoPetTrigger(botAI); }
static Trigger* has_pet(PlayerbotAI* botAI) { return new HasPetTrigger(botAI); }
static Trigger* pet_attack(PlayerbotAI* botAI) { return new PetAttackTrigger(botAI); }
static Trigger* has_attackers(PlayerbotAI* botAI) { return new HasAttackersTrigger(botAI); }
static Trigger* random_bot_update_trigger(PlayerbotAI* botAI) { return new RandomBotUpdateTrigger(botAI); }
static Trigger* no_non_bot_players_around(PlayerbotAI* botAI) { return new NoNonBotPlayersAroundTrigger(botAI); }

4
src/strategy/warrior/TankWarriorStrategy.cpp
View File

@@ -31,12 +31,12 @@ class TankWarriorStrategyActionNodeFactory : public NamedObjectFactory<ActionNod
ACTION_NODE_A(devastate, "devastate", "sunder armor");
ACTION_NODE_A(last_stand, "last stand", "intimidating shout");
ACTION_NODE_A(heroic_throw_on_snare_target, "heroic throw on snare target", "taunt on snare target");
ACTION_NODE_A(heroic_throw_taunt, "heroic throw", "taunt");
ACTION_NODE_A(heroic_throw_taunt, "heroic throw", "shield slam");
static ActionNode* taunt(PlayerbotAI* botAI)
{
return new ActionNode("taunt",
/*P*/ nullptr,
/*A*/ NextAction::array(0, new NextAction("shield slam"), nullptr),
/*A*/ NextAction::array(0, new NextAction("heroic throw taunt"), nullptr),
/*C*/ nullptr);
}
};