Shaman bot fixes and tweeks (#292)

bozimmerman · web-flow · commit 2b2a3ec56dce · 2026-03-25T19:35:29.000Z
diff --git a/src/modules/Bots/playerbot/strategy/shaman/CasterShamanStrategy.cpp b/src/modules/Bots/playerbot/strategy/shaman/CasterShamanStrategy.cpp
@@ -11,6 +11,7 @@ class CasterShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionNo
     CasterShamanStrategyActionNodeFactory()
     {
         creators["magma totem"] = &magma_totem;
+        creators["thunderstorm"] = &thunderstorm;
     }
 private:
     static ActionNode* magma_totem(PlayerbotAI* ai)
@@ -20,6 +21,13 @@ class CasterShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionNo
             /*A*/ NULL,
             /*C*/ NextAction::array(0, new NextAction("fire nova"), NULL));
     }
+    static ActionNode* thunderstorm(PlayerbotAI* ai)
+    {
+        return new ActionNode ("thunderstorm",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("chain lightning"), NULL),
+            /*C*/ NULL);
+    }
 };
 
 CasterShamanStrategy::CasterShamanStrategy(PlayerbotAI* ai) : GenericShamanStrategy(ai)
diff --git a/src/modules/Bots/playerbot/strategy/shaman/GenericShamanStrategy.cpp b/src/modules/Bots/playerbot/strategy/shaman/GenericShamanStrategy.cpp
@@ -20,6 +20,9 @@ class GenericShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionN
         creators["chain heal on party"] = &chain_heal_on_party;
         creators["riptide on party"] = &riptide_on_party;
         creators["earth shock"] = &earth_shock;
+        creators["cleanse spirit"] = &cleanse_spirit;
+        creators["water shield"] = &water_shield;
+        creators["fire nova"] = &fire_nova;
     }
 private:
     static ActionNode* earth_shock(PlayerbotAI* ai)
@@ -29,6 +32,27 @@ class GenericShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionN
             /*A*/ NextAction::array(0, new NextAction("flame shock"), NULL),
             /*C*/ NULL);
     }
+    static ActionNode* cleanse_spirit(PlayerbotAI* ai)
+    {
+        return new ActionNode ("cleanse spirit",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("cleansing totem"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* water_shield(PlayerbotAI* ai)
+    {
+        return new ActionNode ("water shield",
+            /*P*/ NULL,
+            /*A*/ NextAction::array(0, new NextAction("lightning shield"), NULL),
+            /*C*/ NULL);
+    }
+    static ActionNode* fire_nova(PlayerbotAI* ai)
+    {
+        return new ActionNode ("fire nova",
+            /*P*/ NULL,
+            /*A*/ NULL,
+            /*C*/ NULL);
+    }
     static ActionNode* flametongue_weapon(PlayerbotAI* ai)
     {
         return new ActionNode ("flametongue weapon",
diff --git a/src/modules/Bots/playerbot/strategy/shaman/ShamanActions.h b/src/modules/Bots/playerbot/strategy/shaman/ShamanActions.h
@@ -207,4 +207,70 @@ namespace ai
     public:
         CastBloodlustAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "bloodlust") {}
     };
+
+    class CastHeroismAction : public CastBuffSpellAction
+    {
+    public:
+        CastHeroismAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "heroism") {}
+    };
+
+    class CastWaterShieldAction : public CastBuffSpellAction
+    {
+    public:
+        CastWaterShieldAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "water shield") {}
+    };
+
+    class CastCleanseSpiritAction : public CastSpellAction
+    {
+    public:
+        CastCleanseSpiritAction(PlayerbotAI* ai) : CastSpellAction(ai, "cleanse spirit") {}
+        virtual string GetTargetName() { return "self target"; }
+    };
+
+    class CastCleanseSpiritPoisonOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCleanseSpiritPoisonOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse spirit", DISPEL_POISON) {}
+        virtual string getName() { return "cleanse spirit poison on party"; }
+    };
+
+    class CastCleanseSpiritCurseOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCleanseSpiritCurseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse spirit", DISPEL_CURSE) {}
+        virtual string getName() { return "cleanse spirit curse on party"; }
+    };
+
+    class CastCleanseSpiritDiseaseOnPartyAction : public CurePartyMemberAction
+    {
+    public:
+        CastCleanseSpiritDiseaseOnPartyAction(PlayerbotAI* ai) : CurePartyMemberAction(ai, "cleanse spirit", DISPEL_DISEASE) {}
+        virtual string getName() { return "cleanse spirit disease on party"; }
+    };
+
+    class CastFireNovaAction : public CastSpellAction
+    {
+    public:
+        CastFireNovaAction(PlayerbotAI* ai) : CastSpellAction(ai, "fire nova") {}
+        virtual string GetTargetName() { return "self target"; }
+    };
+
+    class CastThunderstormAction : public CastSpellAction
+    {
+    public:
+        CastThunderstormAction(PlayerbotAI* ai) : CastSpellAction(ai, "thunderstorm") {}
+        virtual string GetTargetName() { return "self target"; }
+    };
+
+    class CastGhostWolfAction : public CastBuffSpellAction
+    {
+    public:
+        CastGhostWolfAction(PlayerbotAI* ai) : CastBuffSpellAction(ai, "ghost wolf") {}
+    };
+
+    class CastTremorTotemAction : public CastTotemAction
+    {
+    public:
+        CastTremorTotemAction(PlayerbotAI* ai) : CastTotemAction(ai, "tremor totem") {}
+    };
 }
diff --git a/src/modules/Bots/playerbot/strategy/shaman/ShamanAiObjectContext.cpp b/src/modules/Bots/playerbot/strategy/shaman/ShamanAiObjectContext.cpp
@@ -109,10 +109,14 @@ namespace ai
                 creators["bloodlust"] = &TriggerFactoryInternal::bloodlust;
                 creators["maelstrom weapon"] = &TriggerFactoryInternal::maelstrom_weapon;
                 creators["wind shear on enemy healer"] = &TriggerFactoryInternal::wind_shear_on_enemy_healer;
+                creators["ghost wolf"] = &TriggerFactoryInternal::ghost_wolf;
+                creators["tremor totem"] = &TriggerFactoryInternal::tremor_totem; // unwired intentionally
             }
 
         private:
             static Trigger* maelstrom_weapon(PlayerbotAI* ai) { return new MaelstromWeaponTrigger(ai); }
+            static Trigger* ghost_wolf(PlayerbotAI* ai) { return new GhostWolfTrigger(ai); }
+            static Trigger* tremor_totem(PlayerbotAI* ai) { return new TremorTotemTrigger(ai); }
             static Trigger* heroism(PlayerbotAI* ai) { return new HeroismTrigger(ai); }
             static Trigger* bloodlust(PlayerbotAI* ai) { return new BloodlustTrigger(ai); }
             static Trigger* party_member_cleanse_disease(PlayerbotAI* ai) { return new PartyMemberCleanseSpiritDiseaseTrigger(ai); }
@@ -186,10 +190,32 @@ namespace ai
                 creators["chain lightning"] = &AiObjectContextInternal::chain_lightning;
                 creators["lightning bolt"] = &AiObjectContextInternal::lightning_bolt;
                 creators["bloodlust"] = &AiObjectContextInternal::bloodlust;
+                creators["heroism"] = &AiObjectContextInternal::heroism;
+                creators["water shield"] = &AiObjectContextInternal::water_shield;
+                creators["cleanse spirit"] = &AiObjectContextInternal::cleanse_spirit;
+                creators["cleanse spirit poison on party"] = &AiObjectContextInternal::cleanse_spirit_poison_on_party;
+                creators["cleanse spirit curse on party"] = &AiObjectContextInternal::cleanse_spirit_curse_on_party;
+                creators["cleanse spirit disease on party"] = &AiObjectContextInternal::cleanse_spirit_disease_on_party;
+                creators["cleansing totem"] = &AiObjectContextInternal::cleansing_totem;
+                creators["fire nova"] = &AiObjectContextInternal::fire_nova;
+                creators["thunderstorm"] = &AiObjectContextInternal::thunderstorm;
+                creators["ghost wolf"] = &AiObjectContextInternal::ghost_wolf;
+                creators["tremor totem"] = &AiObjectContextInternal::tremor_totem; // unwired intentionally
             }
 
         private:
             static Action* bloodlust(PlayerbotAI* ai) { return new CastBloodlustAction(ai); }
+            static Action* heroism(PlayerbotAI* ai) { return new CastHeroismAction(ai); }
+            static Action* water_shield(PlayerbotAI* ai) { return new CastWaterShieldAction(ai); }
+            static Action* cleanse_spirit(PlayerbotAI* ai) { return new CastCleanseSpiritAction(ai); }
+            static Action* cleanse_spirit_poison_on_party(PlayerbotAI* ai) { return new CastCleanseSpiritPoisonOnPartyAction(ai); }
+            static Action* cleanse_spirit_curse_on_party(PlayerbotAI* ai) { return new CastCleanseSpiritCurseOnPartyAction(ai); }
+            static Action* cleanse_spirit_disease_on_party(PlayerbotAI* ai) { return new CastCleanseSpiritDiseaseOnPartyAction(ai); }
+            static Action* cleansing_totem(PlayerbotAI* ai) { return new CastCleansingTotemAction(ai); }
+            static Action* fire_nova(PlayerbotAI* ai) { return new CastFireNovaAction(ai); }
+            static Action* thunderstorm(PlayerbotAI* ai) { return new CastThunderstormAction(ai); }
+            static Action* ghost_wolf(PlayerbotAI* ai) { return new CastGhostWolfAction(ai); }
+            static Action* tremor_totem(PlayerbotAI* ai) { return new CastTremorTotemAction(ai); }
             static Action* lightning_bolt(PlayerbotAI* ai) { return new CastLightningBoltAction(ai); }
             static Action* chain_lightning(PlayerbotAI* ai) { return new CastChainLightningAction(ai); }
             static Action* frost_shock(PlayerbotAI* ai) { return new CastFrostShockAction(ai); }
diff --git a/src/modules/Bots/playerbot/strategy/shaman/ShamanNonCombatStrategy.cpp b/src/modules/Bots/playerbot/strategy/shaman/ShamanNonCombatStrategy.cpp
@@ -40,6 +40,10 @@ void ShamanNonCombatStrategy::InitTriggers(std::list<TriggerNode*> &triggers)
     triggers.push_back(new TriggerNode(
         "medium aoe heal",
         NextAction::array(0, new NextAction("chain heal", 27.0f), NULL)));
+
+    triggers.push_back(new TriggerNode(
+        "ghost wolf",
+        NextAction::array(0, new NextAction("ghost wolf", 9.0f), NULL)));
 }
 
 void ShamanNonCombatStrategy::InitMultipliers(std::list<Multiplier*> &multipliers)
diff --git a/src/modules/Bots/playerbot/strategy/shaman/ShamanTriggers.cpp b/src/modules/Bots/playerbot/strategy/shaman/ShamanTriggers.cpp
@@ -20,7 +20,7 @@ bool ShamanWeaponTrigger::IsActive()
 
     for (list<string>::iterator i = spells.begin(); i != spells.end(); ++i)
     {
-        uint32 spellId = AI_VALUE2(uint32, "spell id", spell);
+        uint32 spellId = AI_VALUE2(uint32, "spell id", *i);
         if (!spellId)
         {
             continue;
diff --git a/src/modules/Bots/playerbot/strategy/shaman/ShamanTriggers.h b/src/modules/Bots/playerbot/strategy/shaman/ShamanTriggers.h
@@ -194,4 +194,20 @@ namespace ai
     public:
         WindShearInterruptEnemyHealerSpellTrigger(PlayerbotAI* ai) : InterruptEnemyHealerTrigger(ai, "wind shear") {}
     };
+
+    class GhostWolfTrigger : public BuffTrigger
+    {
+    public:
+        GhostWolfTrigger(PlayerbotAI* ai) : BuffTrigger(ai, "ghost wolf") {}
+    };
+
+    class TremorTotemTrigger : public TotemTrigger
+    {
+    public:
+        TremorTotemTrigger(PlayerbotAI* ai) : TotemTrigger(ai, "tremor totem", 1) {}
+        virtual bool IsActive()
+        {
+            return TotemTrigger::IsActive() && !AI_VALUE2(bool, "has totem", "strength of earth totem");
+        }
+    };
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ bool ShamanWeaponTrigger::IsActive()`
`20`	`20`
`21`	`21`	`for (list<string>::iterator i = spells.begin(); i != spells.end(); ++i)`
`22`	`22`	`{`
`23`		`- uint32 spellId = AI_VALUE2(uint32, "spell id", spell);`
	`23`	`+ uint32 spellId = AI_VALUE2(uint32, "spell id", *i);`
`24`	`24`	`if (!spellId)`
`25`	`25`	`{`
`26`	`26`	`continue;`