Compile Errors Fix for NPCBot Spells Broken From Spell Change Commit 2-18-26

Author: LannyE

src/server/game/AI/NpcBots/bot_ai.cpp

@@ -16842,7 +16842,7 @@ void bot_ai::CastBotItemCombatSpell(DamageInfo const& damageInfo, Item* item, It
     //TODO: custom spell triggers maybe?
 
     // Can do effect if any damage done to target
-    bool canTrigger = (damageInfo.GetHitMask() & (PROC_HIT_NORMAL | PROC_HIT_CRITICAL | PROC_HIT_ABSORB)) != 0;
+    bool canTrigger = (damageInfo.GetBotHitMask() & (PROC_HIT_NORMAL | PROC_HIT_CRITICAL | PROC_HIT_ABSORB)) != 0;
     if (canTrigger)
     {
         for (uint8 i = 0; i != MAX_ITEM_PROTO_SPELLS; ++i)
@@ -16896,7 +16896,7 @@ void bot_ai::CastBotItemCombatSpell(DamageInfo const& damageInfo, Item* item, It
             if (entry && entry->procEx)
             {
                 // Check hit/crit/dodge/parry requirement
-                if ((entry->procEx & damageInfo.GetHitMask()) == 0)
+                if ((entry->procEx & damageInfo.GetBotHitMask()) == 0)
                     continue;
             }
             else

src/server/game/AI/NpcBots/bot_bm_ai.cpp

@@ -680,7 +680,7 @@ class blademaster_bot : public CreatureScript
                 SPELL_SCHOOL_MASK_NORMAL, dinfo.GetAbsorb(), dinfo.GetResist(), false, dinfo.GetBlock(), true);
             CleanDamage cl(0, 0, BASE_ATTACK, MELEE_HIT_CRIT);
             Unit::DealDamage(me, target, dinfo.GetDamage(), &cl);
-            Unit::ProcDamageAndSpell(me, dinfo.GetVictim(), calcdinfo->procAttacker, calcdinfo->procVictim, calcdinfo->procEx, dinfo.GetDamage(), calcdinfo->attackType);
+            Unit::ProcSkillsAndAuras(me, dinfo.GetVictim(), calcdinfo->procAttacker, calcdinfo->procVictim, calcdinfo->procEx, dinfo.GetDamage(), calcdinfo->attackType);
             me->CombatStart(target);
 
             me->resetAttackTimer(BASE_ATTACK);

src/server/game/Entities/Unit/Unit.h

@@ -386,7 +386,7 @@ class DamageInfo
     [[nodiscard]] uint32 GetUnmitigatedDamage() const;
 
     //npcbot
-    [[nodiscard]] uint32 GetHitMask() const { return m_procEx; }
+    [[nodiscard]] uint32 GetBotHitMask() const { return m_procEx; }
     //end npcbot
 };
 
@@ -503,6 +503,7 @@ struct CalcDamageInfo
     WeaponAttackType attackType; //
     uint32 procAttacker;
     uint32 procVictim;
+    uint32 procEx;               //npcbot
     uint32 cleanDamage;          // Used only for rage calculation
     MeleeHitOutcome hitOutCome;  /// @todo: remove this field (need use TargetState)
 };

src/server/scripts/Spells/spell_item.cpp

@@ -28,6 +28,12 @@
 #include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "WorldSession.h"
+
+//npcbot
+#include "botdatamgr.h"
+#include "botmgr.h"
+//end npcbot
+
 /*
  * Scripts for spells with SPELLFAMILY_GENERIC spells used by items.
  * Ordered alphabetically using scriptname.

src/server/scripts/Spells/spell_shaman.cpp

@@ -1600,12 +1600,16 @@ class spell_sha_flametongue_weapon : public AuraScript
         //if (!item || !item->IsEquipped())
         //    return false;
 
-        Item* item = eventInfo.GetCastItem();
-        if (!item && actor->IsPlayer())
-            item = actor->ToPlayer()->GetItemByGuid(GetAura()->GetCastItemGUID());
+        ObjectGuid itemGuid = GetAura()->GetCastItemGUID();
+        Item* item = nullptr;
 
-        if (!item || (actor->IsPlayer() && !item->IsEquipped()))
-            return false;
+        if (actor->IsPlayer())
+            item = actor->ToPlayer()->GetItemByGuid(itemGuid);
+        else if (actor->IsNPCBot())
+            item = actor->ToCreature()->GetBotEquipsByGuid(itemGuid);
+
+        if (!item)
+            return false; // Use 'return false;' if this is inside CheckProc (a bool function)
 
         //WeaponAttackType attType = Player::GetAttackBySlot(item->GetSlot());
         //if (attType != BASE_ATTACK && attType != OFF_ATTACK)
@@ -1653,14 +1657,13 @@ class spell_sha_flametongue_weapon : public AuraScript
         //    return;
 
         // npcbot: Item detection for both players and bots
-        Item* item = eventInfo.GetCastItem();
-        if (!item)
-        {
-            if (actor->IsPlayer())
-                item = actor->ToPlayer()->GetWeaponForAttack(attType);
-            else if (actor->IsNPCBot())
-                item = actor->ToCreature()->GetBotEquips(attType == BASE_ATTACK ? 0 : 1);
-        }
+        ObjectGuid itemGuid = GetAura()->GetCastItemGUID();
+        Item* item = nullptr;
+
+        if (actor->IsPlayer())
+            item = actor->ToPlayer()->GetWeaponForAttack(attType);
+        else if (actor->IsNPCBot())
+            item = actor->ToCreature()->GetBotEquipsByGuid(itemGuid);
 
         if (!item) return;
 
@@ -2234,12 +2237,16 @@ class spell_sha_windfury_weapon : public AuraScript
         //    return false;
 
         // Get the item responsible for the proc
-        Item* item = eventInfo.GetCastItem();
-        if (!item && actor->IsPlayer())
-            item = actor->ToPlayer()->GetItemByGuid(GetAura()->GetCastItemGUID());
+        ObjectGuid itemGuid = GetAura()->GetCastItemGUID();
+        Item* item = nullptr;
 
-        if (!item || (actor->IsPlayer() && !item->IsEquipped()))
-            return false;
+        if (actor->IsPlayer())
+            item = actor->ToPlayer()->GetItemByGuid(itemGuid);
+        else if (actor->IsNPCBot())
+            item = actor->ToCreature()->GetBotEquipsByGuid(itemGuid);
+
+        if (!item)
+            return false; // Use 'return false;' if this is inside CheckProc (a bool function)
 
         //WeaponAttackType attType = Player::GetAttackBySlot(item->GetSlot());
         //if (attType != BASE_ATTACK && attType != OFF_ATTACK)
@@ -2283,10 +2290,16 @@ class spell_sha_windfury_weapon : public AuraScript
         //if (!item)
         //    return;
 
-        Item* item = eventInfo.GetCastItem();
-        if (!item && actor->IsPlayer())
-            item = actor->ToPlayer()->GetItemByGuid(GetAura()->GetCastItemGUID());
-        if (!item) return;
+        ObjectGuid itemGuid = GetAura()->GetCastItemGUID();
+        Item* item = nullptr;
+
+        if (actor->IsPlayer())
+            item = actor->ToPlayer()->GetItemByGuid(itemGuid);
+        else if (actor->IsNPCBot())
+            item = actor->ToCreature()->GetBotEquipsByGuid(itemGuid);
+
+        if (!item)
+            return;
 
         //uint8 slot = item->GetSlot();
         //bool mainHand = slot == EQUIPMENT_SLOT_MAINHAND;
@@ -2323,6 +2336,9 @@ class spell_sha_windfury_weapon : public AuraScript
         //int32 bonus = windfurySpellInfo ? windfurySpellInfo->Effects[EFFECT_1].CalcValue(player) : 0;
         //bonus = int32(bonus * player->GetAttackTime(mainHand ? BASE_ATTACK : OFF_ATTACK) / 1000.f);
 
+        // Calculation is now unified for both types
+        int32 bonus = spellInfo ? spellInfo->Effects[EFFECT_1].CalcValue(actor) : 0;
+        bonus = int32(bonus * actor->GetAttackTime(mainHand ? BASE_ATTACK : OFF_ATTACK) / 1000.f);
 
         //player->CastCustomSpell(spellId, SPELLVALUE_BASE_POINT0, bonus, target, true, item, aurEff);
         //player->CastCustomSpell(spellId, SPELLVALUE_BASE_POINT0, bonus, target, true, item, aurEff);