[fix]weapon enchantment procs

[Auntie Mangos]

What bug does the patch fix? What features does the patch add?

fixes weapon enchantment procs from weapon based spells (like mutilate)

For which repository revision was the patch created?

9362

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

http://getmangos.eu/community/showthread.php?11743-%5BBUG%5D-Mutilate

http://getmangos.eu/community/showthread.php?11761-%5BBUG%5D-%5B9061%5D-Rogue-Poisons

Who has been writing this patch? Please include either forum user names or email addresses.

me, thx to maly32167 for deadloop fix

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 7ba9448..4a46c7f 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -1297,6 +1297,29 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
    // Call default DealDamage (send critical in hit info for threat calculation)
    CleanDamage cleanDamage(damageInfo->cleanDamage, BASE_ATTACK, damageInfo->HitInfo & SPELL_HIT_TYPE_CRIT ? MELEE_HIT_CRIT : MELEE_HIT_NORMAL);
    DealDamage(pVictim, damageInfo->damage, &cleanDamage, SPELL_DIRECT_DAMAGE, SpellSchoolMask(damageInfo->schoolMask), spellProto, durabilityLoss);
+
+    // Check if effect can trigger anything actually (is this a right ATTR ?)
+    if( spellProto->AttributesEx3 & SPELL_ATTR_EX3_UNK16 )
+        return;
+
+    bool hasWeaponDmgEffect = false;
+
+    for (uint32 i = 0; i < 3; ++i)
+    {
+        if (spellProto->Effect[i] == SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL || spellProto->Effect[i] == SPELL_EFFECT_WEAPON_PERCENT_DAMAGE || spellProto->Effect[i] == SPELL_EFFECT_WEAPON_DAMAGE || spellProto->Effect[i] == SPELL_EFFECT_NORMALIZED_WEAPON_DMG)
+        {    
+            hasWeaponDmgEffect = true;
+            break;
+        }
+    }
+
+    if (!(damageInfo->HitInfo & HITINFO_MISS) && hasWeaponDmgEffect) 
+    {
+        WeaponAttackType attType = GetWeaponAttackType(spellProto);
+        // on weapon hit casts
+        if(GetTypeId() == TYPEID_PLAYER && pVictim->isAlive())
+            ((Player*)this)->CastItemCombatSpell(pVictim, attType);
+    }
}

//TODO for melee need create structure as in

haven't found a better way to check for Effect Weapon Dmg , attribs won't work cause spells like "envenom" have them, and dmg class is too wide

[thenecromancer]

It'd be easier to just scan procflag

[catnip]

Hy guys,

I am still learning the guts of Mangos, but the iteration, why does it use ++i? Doesn't it pre-crement, ignoring 0, taking into consideration only 1st and 2nd positions of the array? Or the array spellProto->Effect[] has the 0 position null?

Thanks and i am waiting for a reply,

DFT

[DasBlub]

Hy guys,

I am still learning the guts of Mangos, but the iteration, why does it use ++i? Doesn't it pre-crement, ignoring 0, taking into consideration only 1st and 2nd positions of the array? Or the array spellProto->Effect[] has the 0 position null?

Thanks and i am waiting for a reply,

DFT

no, if you do i++ or ++i doesn't matter in a for(), only in java they have that weird shit that this changes the for()...

the diff is, that with i++, you've to create a copy of i, increment the original i and then return the copy of i in order to get the original number, and with ++i you just increment i and then return it

[Alez]

I think it shouldn't proc on the gouge (it deals damage too), because damage will break stun effect.

[laise]

I think it shouldn't proc on the gouge (it deals damage too), because damage will break stun effect.

is it currently procing? Because i dont see any of these effects on it and Gouge is not weapon damage spell =\\

[Alez]

and Gouge is not weapon damage spell =\\

Oh, ok.

It also should proc on stuns - Cheap Shot and Kidney Shot that doesn't deal damage.

[Raynar]

work with insider42 rep?

[maly32167]

It is really unsafe to check only these effects... i mean, it causes proc things on spells triggered from random things like Unfair Advantage dodge-proc

Also causes (deadly)deadloop from enchants that have effects specified here

if (spellProto->Effect == SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL || spellProto->Effect == SPELL_EFFECT_WEAPON_PERCENT_DAMAGE || spellProto->Effect == SPELL_EFFECT_WEAPON_DAMAGE || spellProto->Effect == SPELL_EFFECT_NORMALIZED_WEAPON_DMG)

So for example http://www.wowhead.com/?spell=50401 procced by Rune of Razorice, as effect is SPELL_EFFECT_WEAPON_PERCENT_DAMAGE it procs DealSpellDamage and then again CastItemCombatSpell for itself, and here we go, a nice deadloop ready

[laise]

maybe don't allow triggered spells here to trigger

[piroy1337]

cant see if spell is triggered, not from that place ;P

[maly32167]

I checked all spells that cause deadloop (enchant has same effect triggered to trigger DealSpellDamage again)

it seems to make the thing, its unknown attr but seems its set for all spells that shouldnt trigger anything other than what they have in SpellEffect

// Check if effect can trigger anything actually (is this a right ATTR ?)
   if( spellProto->AttributesEx3 & SPELL_ATTR_EX3_UNK16 )
       hasWeaponDmgEffect = false;

[DLeonHeart]

bump , this patch is really important for rogues

[DLeonHeart]

Has anyone tested this patch and can share any feedback plz ?

[maly32167]

I am using it for a bit of time already with dead-lock fix i posted up there, seems to work ok, rogues are happy so, its fine

[DLeonHeart]

I am using it for a bit of time already with dead-lock fix i posted up there, seems to work ok, rogues are happy so, its fine

if you could post it with the fix you made i would be really gratefull cause i dont know where to add the check you posted, or you could tell me in what part of the code is it suposed to be.

is it inside

if (spellProto->Effect == SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL || spellProto->Effect == SPELL_EFFECT_WEAPON_PERCENT_DAMAGE || spellProto->Effect == SPELL_EFFECT_WEAPON_DAMAGE || spellProto->Effect == SPELL_EFFECT_NORMALIZED_WEAPON_DMG) ???????????

[volt]

There is .patch in first thread =)

So it patches "src/game/Unit.cpp"

[dogeht]

if you could post it with the fix you made i would be really gratefull cause i dont know where to add the check you posted, or you could tell me in what part of the code is it suposed to be.

is it inside

if (spellProto->Effect == SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL || spellProto->Effect == SPELL_EFFECT_WEAPON_PERCENT_DAMAGE || spellProto->Effect == SPELL_EFFECT_WEAPON_DAMAGE || spellProto->Effect == SPELL_EFFECT_NORMALIZED_WEAPON_DMG) ???????????

maybe it is after the loop

+    bool hasWeaponDmgEffect = false;
+    for (uint32 i = 0; i < 3; ++i)
+    {
+        if (spellProto->Effect[i] == SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL || spellProto->Effect[i] == SPELL_EFFECT_WEAPON_PERCENT_DAMAGE || spellProto->Effect[i] == SPELL_EFFECT_WEAPON_DAMAGE || spellProto->Effect[i] == SPELL_EFFECT_NORMALIZED_WEAPON_DMG)
+        {    
+            hasWeaponDmgEffect = true;
+            break;
+        }
+    }
+// Check if effect can trigger anything actually (is this a right ATTR ?)
+    if( spellProto->AttributesEx3 & SPELL_ATTR_EX3_UNK16 )
+        hasWeaponDmgEffect = false;
+    if (!(damageInfo->HitInfo & HITINFO_MISS) && hasWeaponDmgEffect) 
+    {
+        WeaponAttackType attType = GetWeaponAttackType(spellProto);
+        // on weapon hit casts
+        if(GetTypeId() == TYPEID_PLAYER && pVictim->isAlive())
+            ((Player*)this)->CastItemCombatSpell(pVictim, attType);
+    }

[The_Game_Master]

It'd be easier to just scan procflag

You are right. Any ideea what the procflags might be?

[DLeonHeart]

bump, sad to see such an important mechanic not implemented yet

[przemratajczak]

Maybe SPELL_ATTR_EX3_MAIN_HAND?

edit sorry, read everything carefully now (Gouge and Envenom are included in SPELL_ATTR_EX3_MAIN_HAND)

[Raynar]

is the first post updated with the correct patch?

[laise]

is the first post updated with the correct patch?

yea..updated now with deadloop fix

[Raynar]

Works very good!

[DLeonHeart]

Today i finally had the chance to test this patch, amazing results, ty for this huge improvement