Merge pull request #844 from avirar/paladin_blessings2

Paladins use Greater Blessings

src/AiFactory.cpp

@@ -530,7 +530,7 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const
             else
                 nonCombatEngine->addStrategiesNoInit("dps assist", "bdps", "baoe", nullptr);
 
-            nonCombatEngine->addStrategiesNoInit("cure", nullptr);
+            nonCombatEngine->addStrategiesNoInit("cure", "bgreater", nullptr);
             break;
         case CLASS_HUNTER:
             nonCombatEngine->addStrategiesNoInit("bdps", "dps assist", "pet", nullptr);

src/strategy/druid/DruidActions.cpp

@@ -78,4 +78,25 @@ Unit* CastRejuvenationOnNotFullAction::GetTarget()
 bool CastRejuvenationOnNotFullAction::isUseful()
 {
     return GetTarget();
-}
+}
+
+bool CastMarkOfTheWildOnPartyAction::Execute(Event event)
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return false;
+
+    // Is the bot in a group?
+    Group* group = botAI->GetBot()->GetGroup();
+    if (group)
+    {
+        // If the bot can cast "gift of the wild" on this target, do so
+        if (botAI->CanCastSpell("gift of the wild", target))
+        {
+            return botAI->CastSpell("gift of the wild", target);
+        }
+    }
+
+    // Otherwise, fall back to single-target "mark of the wild"
+    return botAI->CastSpell("mark of the wild", target);
+}

src/strategy/druid/DruidActions.h

@@ -95,7 +95,9 @@ class CastMarkOfTheWildAction : public CastBuffSpellAction
 class CastMarkOfTheWildOnPartyAction : public BuffOnPartyAction
 {
 public:
-    CastMarkOfTheWildOnPartyAction(PlayerbotAI* botAI) : BuffOnPartyAction(botAI, "mark of the wild") {}
+    CastMarkOfTheWildOnPartyAction(PlayerbotAI* botAI) : BuffOnPartyAction(botAI, "gift of the wild") {}
+
+    bool Execute(Event event) override;
 };
 
 class CastSurvivalInstinctsAction : public CastBuffSpellAction

src/strategy/druid/DruidTriggers.cpp

@@ -9,12 +9,16 @@
 
 bool MarkOfTheWildOnPartyTrigger::IsActive()
 {
-    return BuffOnPartyTrigger::IsActive() && !botAI->HasAura("gift of the wild", GetTarget());
+    // Check both Gift & Mark auras
+    return BuffOnPartyTrigger::IsActive() &&
+           !botAI->HasAnyAuraOf(GetTarget(), "gift of the wild", "mark of the wild", nullptr);
 }
 
 bool MarkOfTheWildTrigger::IsActive()
 {
-    return BuffTrigger::IsActive() && !botAI->HasAura("gift of the wild", GetTarget());
+    // Same check for single-target scenario
+    return BuffTrigger::IsActive() &&
+           !botAI->HasAnyAuraOf(GetTarget(), "gift of the wild", "mark of the wild", nullptr);
 }
 
 bool ThornsOnPartyTrigger::IsActive()

src/strategy/mage/MageActions.cpp

@@ -21,3 +21,24 @@ bool CastConeOfColdAction::isUseful()
     bool targetClose = sServerFacade->IsDistanceLessOrEqualThan(AI_VALUE2(float, "distance", GetTargetName()), 10.f);
     return facingTarget && targetClose;
 }
+
+bool CastArcaneIntellectOnPartyAction::Execute(Event event)
+{
+    Unit* target = GetTarget();
+    if (!target)
+        return false;
+
+    Group* group = botAI->GetBot()->GetGroup();
+
+    if (group)
+    {
+        if (botAI->CanCastSpell("dalaran brilliance", target))
+            return botAI->CastSpell("dalaran brilliance", target);
+
+        if (botAI->CanCastSpell("arcane brilliance", target))
+            return botAI->CastSpell("arcane brilliance", target);
+    }
+
+    // If not in a group or we cannot cast brilliance, fall back to arcane intellect
+    return botAI->CastSpell("arcane intellect", target);
+}

src/strategy/mage/MageActions.h

@@ -120,6 +120,7 @@ class CastArcaneIntellectOnPartyAction : public BuffOnPartyAction
 {
 public:
     CastArcaneIntellectOnPartyAction(PlayerbotAI* botAI) : BuffOnPartyAction(botAI, "arcane intellect") {}
+    bool Execute(Event event) override;
 };
 
 class CastRemoveCurseAction : public CastCureSpellAction

src/strategy/mage/MageTriggers.cpp

@@ -10,12 +10,16 @@
 
 bool ArcaneIntellectOnPartyTrigger::IsActive()
 {
-    return BuffOnPartyTrigger::IsActive() && !botAI->HasAura("arcane brilliance", GetTarget());
+    return BuffOnPartyTrigger::IsActive() &&
+        !botAI->HasAnyAuraOf(GetTarget(), "arcane brilliance", "arcane intellect", "dalaran brilliance",
+            "dalaran intellect", nullptr);
 }
 
 bool ArcaneIntellectTrigger::IsActive()
 {
-    return BuffTrigger::IsActive() && !botAI->HasAura("arcane brilliance", GetTarget());
+    return BuffTrigger::IsActive() &&
+        !botAI->HasAnyAuraOf(GetTarget(), "arcane brilliance", "arcane intellect", "dalaran brilliance",
+            "dalaran intellect", nullptr);
 }
 
 bool MageArmorTrigger::IsActive()