Fix druids not shapeshifting correctly when casting healing spells an…

…d fixed strategies
celguar · Jul 26, 2023 · 9072672 · 9072672
1 parent f67a3b1
commit 9072672
Show file tree

Hide file tree

Showing 10 changed files with 405 additions and 96 deletions.
diff --git a/playerbot/strategy/actions/GenericSpellActions.cpp b/playerbot/strategy/actions/GenericSpellActions.cpp
@@ -219,7 +219,7 @@ NextAction** CastSpellAction::getPrerequisites()
         }
     }
 
-    return nullptr;
+    return Action::getPrerequisites();
 }
 
 void CastSpellAction::SetSpellName(const string& name, string spellIDContextName /*= "spell id"*/)

diff --git a/playerbot/strategy/druid/BalanceDruidStrategy.cpp b/playerbot/strategy/druid/BalanceDruidStrategy.cpp
@@ -36,6 +36,28 @@ void BalanceDruidStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 {
     DruidStrategy::InitCombatTriggers(triggers);
 
+    triggers.push_back(new TriggerNode(
+        "rebirth on party",
+        NextAction::array(0, new NextAction("rebirth", ACTION_EMERGENCY), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch on party", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL), NULL)));
+
     triggers.push_back(new TriggerNode(
         "almost full health",
         NextAction::array(0, new NextAction("rejuvenation", ACTION_LIGHT_HEAL), NULL)));
@@ -221,7 +243,7 @@ void BalanceDruidBuffStrategy::InitCombatTriggers(std::list<TriggerNode*>& trigg
 
     triggers.push_back(new TriggerNode(
         "moonkin form",
-        NextAction::array(0, new NextAction("moonkin form", ACTION_EMERGENCY), NULL)));
+        NextAction::array(0, new NextAction("moonkin form", ACTION_MOVE), NULL)));
 }
 
 void BalanceDruidBuffStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -432,6 +454,28 @@ void BalanceDruidStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 {
     DruidStrategy::InitCombatTriggers(triggers);
 
+    triggers.push_back(new TriggerNode(
+        "rebirth on party",
+        NextAction::array(0, new NextAction("rebirth", ACTION_EMERGENCY), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch on party", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL), NULL)));
+
     triggers.push_back(new TriggerNode(
         "almost full health",
         NextAction::array(0, new NextAction("rejuvenation", ACTION_LIGHT_HEAL), NULL)));
@@ -605,7 +649,7 @@ void BalanceDruidBuffStrategy::InitCombatTriggers(std::list<TriggerNode*>& trigg
 
     triggers.push_back(new TriggerNode(
         "moonkin form",
-        NextAction::array(0, new NextAction("moonkin form", ACTION_EMERGENCY), NULL)));
+        NextAction::array(0, new NextAction("moonkin form", ACTION_MOVE), NULL)));
 }
 
 void BalanceDruidBuffStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)
@@ -816,6 +860,28 @@ void BalanceDruidStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers)
 {
     DruidStrategy::InitCombatTriggers(triggers);
 
+    triggers.push_back(new TriggerNode(
+        "rebirth on party",
+        NextAction::array(0, new NextAction("rebirth", ACTION_EMERGENCY), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch on party", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL), NULL)));
+
     triggers.push_back(new TriggerNode(
         "almost full health",
         NextAction::array(0, new NextAction("rejuvenation", ACTION_LIGHT_HEAL), NULL)));
@@ -997,7 +1063,7 @@ void BalanceDruidBuffStrategy::InitCombatTriggers(std::list<TriggerNode*>& trigg
 
     triggers.push_back(new TriggerNode(
         "moonkin form",
-        NextAction::array(0, new NextAction("moonkin form", ACTION_EMERGENCY), NULL)));
+        NextAction::array(0, new NextAction("moonkin form", ACTION_MOVE), NULL)));
 }
 
 void BalanceDruidBuffStrategy::InitNonCombatTriggers(std::list<TriggerNode*>& triggers)

diff --git a/playerbot/strategy/druid/DpsFeralDruidStrategy.cpp b/playerbot/strategy/druid/DpsFeralDruidStrategy.cpp
@@ -81,6 +81,28 @@ void DpsFeralDruidStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers
 {
     DruidStrategy::InitCombatTriggers(triggers);
 
+    triggers.push_back(new TriggerNode(
+        "rebirth on party",
+        NextAction::array(0, new NextAction("rebirth", ACTION_EMERGENCY), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch on party", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL), NULL)));
+
     triggers.push_back(new TriggerNode(
         "faerie fire (feral)",
         NextAction::array(0, new NextAction("faerie fire (feral)", ACTION_NORMAL + 5), NULL)));
@@ -281,7 +303,7 @@ void DpsFeralDruidBuffStrategy::InitCombatTriggers(std::list<TriggerNode*>& trig
 
     triggers.push_back(new TriggerNode(
         "cat form",
-        NextAction::array(0, new NextAction("cat form", ACTION_EMERGENCY), NULL)));
+        NextAction::array(0, new NextAction("cat form", ACTION_MOVE), NULL)));
 
     triggers.push_back(new TriggerNode(
         "tiger's fury",
@@ -567,6 +589,28 @@ void DpsFeralDruidStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers
 {
     DruidStrategy::InitCombatTriggers(triggers);
 
+    triggers.push_back(new TriggerNode(
+        "rebirth on party",
+        NextAction::array(0, new NextAction("rebirth", ACTION_EMERGENCY), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch on party", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL), NULL)));
+
     triggers.push_back(new TriggerNode(
         "faerie fire (feral)",
         NextAction::array(0, new NextAction("faerie fire (feral)", ACTION_HIGH + 2), NULL)));
@@ -775,7 +819,7 @@ void DpsFeralDruidBuffStrategy::InitCombatTriggers(std::list<TriggerNode*>& trig
 
     triggers.push_back(new TriggerNode(
         "cat form",
-        NextAction::array(0, new NextAction("cat form", ACTION_EMERGENCY), NULL)));
+        NextAction::array(0, new NextAction("cat form", ACTION_MOVE), NULL)));
 
     triggers.push_back(new TriggerNode(
         "tiger's fury",
@@ -1061,6 +1105,28 @@ void DpsFeralDruidStrategy::InitCombatTriggers(std::list<TriggerNode*>& triggers
 {
     DruidStrategy::InitCombatTriggers(triggers);
 
+    triggers.push_back(new TriggerNode(
+        "rebirth on party",
+        NextAction::array(0, new NextAction("rebirth", ACTION_EMERGENCY), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "critical health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member critical health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_CRITICAL_HEAL + 1),
+                             new NextAction("healing touch on party", ACTION_CRITICAL_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "low health",
+        NextAction::array(0, new NextAction("regrowth", ACTION_MEDIUM_HEAL), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "party member low health",
+        NextAction::array(0, new NextAction("regrowth on party", ACTION_MEDIUM_HEAL), NULL)));
+
     triggers.push_back(new TriggerNode(
         "enemy out of melee",
         NextAction::array(0, new NextAction("feral charge - cat", ACTION_MOVE), NULL)));
@@ -1273,7 +1339,7 @@ void DpsFeralDruidBuffStrategy::InitCombatTriggers(std::list<TriggerNode*>& trig
 
     triggers.push_back(new TriggerNode(
         "cat form",
-        NextAction::array(0, new NextAction("cat form", ACTION_EMERGENCY), NULL)));
+        NextAction::array(0, new NextAction("cat form", ACTION_MOVE), NULL)));
 
     triggers.push_back(new TriggerNode(
         "tiger's fury",

diff --git a/playerbot/strategy/druid/DruidActions.h b/playerbot/strategy/druid/DruidActions.h
@@ -66,11 +66,6 @@ namespace ai
 	{
 	public:
 		CastRebirthAction(PlayerbotAI* ai) : ResurrectPartyMemberAction(ai, "rebirth") {}
-
-		virtual NextAction** getPrerequisites() 
-		{
-			return NextAction::merge( NextAction::array(0, new NextAction("caster form"), NULL), ResurrectPartyMemberAction::getPrerequisites());
-		}
 	};
 
 	BUFF_ACTION(CastMarkOfTheWildAction, "mark of the wild");

diff --git a/playerbot/strategy/druid/DruidAiObjectContext.cpp b/playerbot/strategy/druid/DruidAiObjectContext.cpp
@@ -328,6 +328,8 @@ namespace ai
                 creators["no stealth"] = &TriggerFactoryInternal::no_stealth;
                 creators["stealth"] = &TriggerFactoryInternal::stealth;
                 creators["powershift"] = &TriggerFactoryInternal::powershift;
+                creators["rebirth on party"] = &TriggerFactoryInternal::rebirth_on_party;
+                creators["innervate self"] = &TriggerFactoryInternal::innervate_self;
             }
 
         private:
@@ -371,6 +373,8 @@ namespace ai
             static Trigger* no_stealth(PlayerbotAI* ai) { return new NoStealthTrigger(ai); }
             static Trigger* stealth(PlayerbotAI* ai) { return new StealthTrigger(ai); }
             static Trigger* powershift(PlayerbotAI* ai) { return new PowershiftTrigger(ai); }
+            static Trigger* rebirth_on_party(PlayerbotAI* ai) { return new RebirthOnPartyTrigger(ai); }
+            static Trigger* innervate_self(PlayerbotAI* ai) { return new InnervateSelfTrigger(ai); }
         };
 
         class AiObjectContextInternal : public NamedObjectContext<Action>