Merge f449767 into b5d14f3

Author: bozimmerman

src/modules/Bots/playerbot/strategy/generic/DeadStrategy.cpp

@@ -9,8 +9,9 @@ void DeadStrategy::InitTriggers(std::list<TriggerNode*> &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(

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

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;