diff --git a/src/modules/Bots/playerbot/strategy/generic/DeadStrategy.cpp b/src/modules/Bots/playerbot/strategy/generic/DeadStrategy.cpp index b10c636eb..deb7d87d9 100644 --- a/src/modules/Bots/playerbot/strategy/generic/DeadStrategy.cpp +++ b/src/modules/Bots/playerbot/strategy/generic/DeadStrategy.cpp @@ -9,8 +9,9 @@ void DeadStrategy::InitTriggers(std::list &triggers) { PassTroughStrategy::InitTriggers(triggers); + // Trigger name changed from "dead" to "bot dead" because of collision with AI_VALUE2(bool, "dead", ...)) triggers.push_back(new TriggerNode( - "dead", + "bot dead", NextAction::array(0, new NextAction("revive from corpse", relevance), NULL))); triggers.push_back(new TriggerNode( diff --git a/src/modules/Bots/playerbot/strategy/triggers/HealthTriggers.h b/src/modules/Bots/playerbot/strategy/triggers/HealthTriggers.h index 145ec569e..5b65ba0cc 100644 --- a/src/modules/Bots/playerbot/strategy/triggers/HealthTriggers.h +++ b/src/modules/Bots/playerbot/strategy/triggers/HealthTriggers.h @@ -131,7 +131,7 @@ namespace ai class DeadTrigger : public Trigger { public: - DeadTrigger(PlayerbotAI* ai) : Trigger(ai, "dead", 10) {} + DeadTrigger(PlayerbotAI* ai) : Trigger(ai, "bot dead", 10) {} virtual string GetTargetName() { return "self target"; } virtual bool IsActive(); }; diff --git a/src/modules/Bots/playerbot/strategy/triggers/TriggerContext.h b/src/modules/Bots/playerbot/strategy/triggers/TriggerContext.h index 69e31b3ad..36e4fffc6 100644 --- a/src/modules/Bots/playerbot/strategy/triggers/TriggerContext.h +++ b/src/modules/Bots/playerbot/strategy/triggers/TriggerContext.h @@ -69,7 +69,7 @@ namespace ai creators["medium threat"] = &TriggerContext::MediumThreat; - creators["dead"] = &TriggerContext::Dead; + creators["bot dead"] = &TriggerContext::Dead; creators["party member dead"] = &TriggerContext::PartyMemberDead; creators["no pet"] = &TriggerContext::no_pet; creators["has attackers"] = &TriggerContext::has_attackers;