[patch]Tricks of the Trade, Misdirection

[Auntie Mangos]

You need a map.h without this you will get compile error and you must add IsInWorld() to prevent crash

Like I said http://getmangos.eu/community/viewtopic.php?id=15121&p=123374&viewfull=1#post123374

[Auntie Mangos]

You need a map.h without this you will get compile error and you must add IsInWorld() to prevent crash

Like I said http://getmangos.eu/community/viewtopic.php?id=15121&p=123374&viewfull=1#post123374

no error, no crash. check plz ^^;;

[ascent]

Description of the feature?

none

For which repository revision was the patch created?

10409

Is there a thread in the bug report section or at lighthouse?

Spell.h

         void EffectTitanGrip(SpellEffectIndex eff_idx);
         void EffectEnchantItemPrismatic(SpellEffectIndex eff_idx);
         void EffectPlayMusic(SpellEffectIndex eff_idx); 
+         void EffectRedirectThreat(SpellEffectIndex eff_idx);
         void EffectSpecCount(SpellEffectIndex eff_idx);
         void EffectActivateSpec(SpellEffectIndex eff_idx);

SpellAuras.cpp

                   return;
            }

+             case 34477: //Misdirection    
+             case 57934: //Tricks of Trade    
+             {    
+                 if(Unit * caster = GetCaster())    
+                     caster->SetThreatRedirectionTarget(0, 0);    
+                 return;    
+             }    
            case 58600:                                     // Restricted Flight Area    
            {    
                AreaTableEntry const* area = GetAreaEntryByAreaID(target->GetAreaId());

SpellEffects.cpp

    &Spell::EffectProspecting,                              //127 SPELL_EFFECT_PROSPECTING Prospecting spell    
    &Spell::EffectApplyAreaAura,                            //128 SPELL_EFFECT_APPLY_AREA_AURA_FRIEND
    &Spell::EffectApplyAreaAura,                            //129 SPELL_EFFECT_APPLY_AREA_AURA_ENEMY     
-    &Spell::EffectNULL,                                     //130 SPELL_EFFECT_REDIRECT_THREAT    
+    &Spell::EffectRedirectThreat,                           //130 SPELL_EFFECT_REDIRECT_THREAT    
    &Spell::EffectUnused,                                   //131 SPELL_EFFECT_131                      used in some test spells    
    &Spell::EffectPlayMusic,                                //132 SPELL_EFFECT_PLAY_MUSIC               sound id in misc value (SoundEntries.dbc)    
    &Spell::EffectUnlearnSpecialization,                    //133 SPELL_EFFECT_UNLEARN_SPECIALIZATION   unlearn profession specialization
...    ...    
@@ -8348,6 +8348,17 @@ void Spell::EffectRestoreItemCharges( SpellEffectIndex eff_idx )    
    item->RestoreCharges();    
}    

+void Spell::EffectRedirectThreat(SpellEffectIndex eff_idx)    
+{    
+    if(unitTarget)    
+    {    
+        m_caster->SetThreatRedirectionTarget(unitTarget->GetGUID(), (uint32)damage);    
+    
+        // Tricks of trade hacky buff applying (15% damage increase)    
+        if( m_spellInfo->Id == 57934 )    
+            unitTarget->CastSpell(unitTarget, 57933, true);    
+    }    
+}    
void Spell::EffectTeachTaxiNode( SpellEffectIndex eff_idx )    
{    
    if (unitTarget->GetTypeId() != TYPEID_PLAYER)

SpellMgr.cpp

            if( spellInfo_1->SpellIconID == 2285 && spellInfo_2->SpellIconID == 2285 )    
                return false;    

+            //Tricks of Trade
+            if( spellInfo_1->SpellIconID == 3413 && spellInfo_2->SpellIconID == 3413 )
+                return false;
+    
            // Garrote -> Garrote-Silence (multi-family check)
            if( spellInfo_1->SpellIconID == 498 && spellInfo_2->SpellIconID == 498 && spellInfo_2->SpellVisual[0] == 0 )
                return false;

ThreatManager.cpp

    float threat = ThreatCalcHelper::calcThreat(pVictim, iOwner, pThreat, crit, schoolMask, pThreatSpell);    

+    if( pVictim->GetThreatRedirectionPercent() && threat > 0.0f )    
+    {    
+        float redirectedThreat = threat * pVictim->GetThreatRedirectionPercent() / 100;    
+        threat -= redirectedThreat;    
+        if(Unit *unit = pVictim->GetMisdirectionTarget())    
+            iThreatContainer.addThreat(unit, redirectedThreat);    
+    }    
+    
    HostileReference* ref = iThreatContainer.addThreat(pVictim, threat);    
    // Ref is online    
    if (ref)

Unit.cpp

    m_charmInfo = NULL;    

+    m_ThreatRedirectionPercent = 0;
+    m_misdirectionTargetGUID = 0;
+    
    // remove aurastates allowing special moves
    for(int i=0; i < MAX_REACTIVE; ++i)    
        m_reactiveTimer[i] = 0;

Unit.h

        void AddPetAura(PetAura const* petSpell);    
        void RemovePetAura(PetAura const* petSpell);

+        void SetThreatRedirectionTarget(uint64 guid, uint32 pct)    
+        {
+            m_misdirectionTargetGUID = guid;    
+            m_ThreatRedirectionPercent = pct;    
+        }    
+        uint32 GetThreatRedirectionPercent() { return m_ThreatRedirectionPercent; }
+        Unit *GetMisdirectionTarget() { return m_misdirectionTargetGUID ? GetMap()->GetUnit(m_misdirectionTargetGUID) : NULL; }    
+    
        // Movement info    
        MovementInfo m_movementInfo;    

...    ...    
@@ -1971,6 +1979,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject    
        ComboPointHolderSet m_ComboPointHolders;

        GuardianPetList m_guardianPets;
+        uint32 m_ThreatRedirectionPercent;    
+        uint64 m_misdirectionTargetGUID;

        uint64 m_TotemSlot[MAX_TOTEM_SLOT];    
};

good luck

[Schmoozerd]

you are sure that

Unit *GetMisdirectionTarget() { return m_misdirectionTargetGUID ? [b]GetUnit(*this, m_misdirectionTargetGUID)[/b] : NULL; }

will compile with mangos?

[ascent]

sure, but i think this patch have some mistake. anyone help

Unit *GetMisdirectionTarget() { return m_misdirectionTargetGUID ? GetUnit(*this, m_misdirectionTargetGUID) : NULL; }

this bug fix.

this patch make july 21.

so change some code. but i don't know so, help us.

[Flemzard]

You should write this

Unit *GetMisdirectionTarget() { return ( m_misdirectionTargetGUID && IsInWorld() ) ? GetMap()->GetUnit(m_misdirectionTargetGUID) : NULL; }

and add a new include

#include "Map.h"

[Toinan67]

Not with current rev, for sure ^^

Thanks for sharing this with us, ascent. Are you the author?

Next time, try to give us a patch file instead of 10 pieces of code

I'll try to do it

[ascent]

You should write this

Unit *GetMisdirectionTarget() { return ( m_misdirectionTargetGUID && IsInWorld() ) ? GetMap()->GetUnit(m_misdirectionTargetGUID) : NULL; }

and add a new include

#include "Map.h"

thx, change first post.

[ascent]

^^ yes, i will try

[Flemzard]

I already use this but adapted for 0.12 and for now seem to work fine

[Most_Mangos]

Who did test? Does work?

[Flemzard]

500 players did the test for me. it's on my server since around 3weeks and good return

[Toinan67]

Edit : I'm blind ^^

[ascent]

Edit : I'm blind ^^

work perfect ^^;;

[Toinan67]

I made a new patch :

- added a struct ThreatRedirectInfo

- handles correctly Tricks of the Trade and Misdirection. 30 sec buff apply, then 6 sec (4 for misdirection) buff when the player does anything that modify his threat

- didn't test it

http://paste2.org/p/967128

based on ascent's patch

[zhenya`]

where is a part for unapply? this is a bug which can produce boss and mobs freeze

[breakwater]

- didn't test it

Could you test your patch? Works?

[ascent]

where is a part for unapply? this is a bug which can produce boss and mobs freeze

use my patch? don't have bug

[breakwater]

I have merge the patch from Toinan67 and ascent to a useable patch with

-handles correctly Tricks of the Trade and Misdirection. 30 sec buff apply, then 6 sec (4 for misdirection) buff when the player does anything that modify his threat

- didn't test it

I have test and it works great

The patchfile: http://paste2.org/p/968584

Enjoy

use my patch? don't have bug

In my testing the player have not the 4 or 6 sec buff

[ascent]

I have merge the patch from Toinan67 and ascent to a useable patch with

I have test and it works great

The patchfile: http://paste2.org/p/968584

Enjoy

In my testing the player have not the 4 or 6 sec buff

hm.. really??? i have 4~6 sec buff.

[ascent]

Unit.h

-               #include "map.h"
-               Unit *GetMisdirectionTarget() { return m_misdirectionTargetGUID ? GetUnit(*this, m_misdirectionTargetGUID) : NULL; }
+              Unit *GetMisdirectionTarget() { return m_misdirectionTargetGUID ? GetMap()->GetUnit(m_misdirectionTargetGUID) : NULL; }

first post add ^^;;

[breakwater]

are you sure that you don't need

#include "map.h"

I need map.h in this function

GetMap()->GetUnit...

[michalpolko]

Thanks for the patch. Are You working at Vigilance http://www.wowhead.com/spell=50720 ? It seems to be a similiar spell.

[Flemzard]

I said to "prevent" crash, just for safe

[ascent]

I said to "prevent" crash, just for safe

your care is good, but,

And this will most wrong way from possible.

Remember simple thing: never never add new includes to .h file if you not 100% sure that this correct and will not add unexpected results.

In C/C++ very easy get cyclic header dependences with very unclear error messages.

Alswasy instead if possible use forward class/structure declarations.