Update ImbueAction.cpp

Author: brighton-chi

src/strategy/actions/ImbueAction.cpp

@@ -4,7 +4,6 @@
  */
 
 #include "ImbueAction.h"
-
 #include "Event.h"
 #include "Playerbots.h"
 
@@ -15,60 +14,59 @@ bool ImbueWithPoisonAction::Execute(Event event)
     if (bot->IsInCombat())
         return false;
 
-    // remove stealth
     if (bot->HasAura(SPELL_AURA_MOD_STEALTH))
         bot->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
 
     if (bot->getStandState() != UNIT_STAND_STATE_STAND)
         bot->SetStandState(UNIT_STAND_STATE_STAND);
 
-    static const std::vector<uint32_t> prioritizedInstantPoisons = {
+    static const std::vector<uint32_t> prioritizedInstantPoisons = 
+    {
         INSTANT_POISON_IX, INSTANT_POISON_VIII, INSTANT_POISON_VII, INSTANT_POISON_VI, INSTANT_POISON_V, INSTANT_POISON_IV,
         INSTANT_POISON_III, INSTANT_POISON_II, INSTANT_POISON
     };
 
-    static const std::vector<uint32_t> prioritizedDeadlyPoisons = {
+    static const std::vector<uint32_t> prioritizedDeadlyPoisons = 
+    {
         DEADLY_POISON_IX, DEADLY_POISON_VIII, DEADLY_POISON_VII, DEADLY_POISON_VI, DEADLY_POISON_V, DEADLY_POISON_IV,
         DEADLY_POISON_III, DEADLY_POISON_II, DEADLY_POISON
     };
 
-    // Check if we have any deadly or instant poisons
     Item* deadlyPoison = nullptr;
     for (auto id : prioritizedDeadlyPoisons)
     {
         deadlyPoison = botAI->FindConsumable(id);
-        if (deadlyPoison) break;
+        if (deadlyPoison) 
+            break;
     }
 
     Item* instantPoison = nullptr;
     for (auto id : prioritizedInstantPoisons)
     {
         instantPoison = botAI->FindConsumable(id);
-        if (instantPoison) break;
+        if (instantPoison) 
+            break;
     }
 
+    bool appliedPoison = false;
+
     // Mainhand
     Item* poison = nullptr;
     Item* weapon = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
     if (weapon && weapon->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT) == 0)
     {
         if (instantPoison && deadlyPoison)
-        {
             poison = instantPoison;
-        }
         else if (deadlyPoison)
-        {
             poison = deadlyPoison;
-        }
         else if (instantPoison)
-        {
             poison = instantPoison;
-        }
 
         if (poison)
         {
             botAI->ImbueItem(poison, EQUIPMENT_SLOT_MAINHAND);
             botAI->SetNextCheckDelay(5);
+            appliedPoison = true;
         }
     }
 
@@ -78,46 +76,39 @@ bool ImbueWithPoisonAction::Execute(Event event)
     if (weapon && weapon->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT) == 0)
     {
         if (deadlyPoison && instantPoison)
-        {
             poison = deadlyPoison;
-        }
         else if (instantPoison)
-        {
             poison = instantPoison;
-        }
         else if (deadlyPoison)
-        {
             poison = deadlyPoison;
-        }
 
         if (poison)
         {
             botAI->ImbueItem(poison, EQUIPMENT_SLOT_OFFHAND);
             botAI->SetNextCheckDelay(5);
+            appliedPoison = true;
         }
     }
 
-    return true;
+    return appliedPoison;
 }
 
-// Search and apply stone to weapons
 ImbueWithStoneAction::ImbueWithStoneAction(PlayerbotAI* botAI) : Action(botAI, "apply stone") {}
 
 bool ImbueWithStoneAction::Execute(Event event)
 {
     if (bot->IsInCombat())
         return false;
 
-    // remove stealth
     if (bot->HasAura(SPELL_AURA_MOD_STEALTH))
         bot->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
 
-    // hp check
     if (bot->getStandState() != UNIT_STAND_STATE_STAND)
         bot->SetStandState(UNIT_STAND_STATE_STAND);
 
-    // Search and apply stone to weapons
-    // Mainhand ...
+    bool appliedStone = false;
+
+    // Mainhand
     Item* stone = nullptr;
     Item* weapon = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
     if (weapon && weapon->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT) == 0)
@@ -127,10 +118,11 @@ bool ImbueWithStoneAction::Execute(Event event)
         {
             botAI->ImbueItem(stone, EQUIPMENT_SLOT_MAINHAND);
             botAI->SetNextCheckDelay(5);
+            appliedStone = true;
         }
     }
 
-    //... and offhand
+    // Offhand
     weapon = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
     if (weapon && weapon->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT) == 0)
     {
@@ -139,29 +131,28 @@ bool ImbueWithStoneAction::Execute(Event event)
         {
             botAI->ImbueItem(stone, EQUIPMENT_SLOT_OFFHAND);
             botAI->SetNextCheckDelay(5);
+            appliedStone = true;
         }
     }
 
-    return true;
+    return appliedStone;
 }
 
-// Search and apply oil to weapons
 ImbueWithOilAction::ImbueWithOilAction(PlayerbotAI* botAI) : Action(botAI, "apply oil") {}
 
 bool ImbueWithOilAction::Execute(Event event)
 {
     if (bot->IsInCombat())
         return false;
 
-    // remove stealth
     if (bot->HasAura(SPELL_AURA_MOD_STEALTH))
         bot->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
 
-    // hp check
     if (bot->getStandState() != UNIT_STAND_STATE_STAND)
         bot->SetStandState(UNIT_STAND_STATE_STAND);
 
-    // Search and apply oil to weapons
+    bool appliedOil = false;
+
     Item* oil = nullptr;
     Item* weapon = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
     if (weapon && weapon->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT) == 0)
@@ -171,13 +162,15 @@ bool ImbueWithOilAction::Execute(Event event)
         {
             botAI->ImbueItem(oil, EQUIPMENT_SLOT_MAINHAND);
             botAI->SetNextCheckDelay(5);
+            appliedOil = true;
         }
     }
 
-    return true;
+    return appliedOil;
 }
 
-static const uint32 uPrioritizedHealingItemIds[19] = {
+static const uint32 uPrioritizedHealingItemIds[19] = 
+{
     HEALTHSTONE,
     FEL_REGENERATION_POTION,
     SUPER_HEALING_POTION,
@@ -207,13 +200,16 @@ bool TryEmergencyAction::Execute(Event event)
     if ((botAI->IsHeal(bot)) && (bot->GetPowerPct(POWER_MANA) > 20))
         return false;
 
+    bool usedHealingItem = false;
+
     // If bot does not have aggro: use bandage instead of potion/stone/crystal
     if ((!AI_VALUE(uint8, "my attacker count")) && !bot->HasAura(11196))  // Recently bandaged
     {
         if (Item* bandage = botAI->FindBandage())
         {
             botAI->ImbueItem(bandage, bot);
             botAI->SetNextCheckDelay(8);
+            usedHealingItem = true;
         }
     }
 
@@ -223,8 +219,9 @@ bool TryEmergencyAction::Execute(Event event)
         if (Item* healthItem = botAI->FindConsumable(uPrioritizedHealingItemIds[i]))
         {
             botAI->ImbueItem(healthItem);
+            usedHealingItem = true;
         }
     }
 
-    return true;
+    return usedHealingItem;
 }