[added][backport/mangos-0.12]ProcFlag backported for mangos-0.12

Auntie Mangos · January 1, 1970

This patch is the backport of the original procflag patch by DiSlord

What features does the patch add?

Changes in spell system
I wont get this after all:

1 - Need merge damage calculation from damage dealing

2 - Need move spell hit result from damage calculation at moment than sending opcode SMSG_SPELL_GO

3 - Need parse all effects not every effect for all assigned targets - need every unique target all assigned effects

4 - In all damage effects damage just calculated not deal

5 - After all effects parsed - need do triggers for victim (and remember for attacker), damage can be change on it - (partly created)

6 - Deal calculated damage for victim

7 - After all victims triggers - need do attacker trigger (summ for all victim result) -(partly created)

Whats complete?

Now damage deal in 3 step:

1 - Calculate damage

2 - Do triggers

3 - Deal damage and send result to client.

For this damage in effects just calculated...

Fixes:

- support cooldown for triggers

- now all triggers working

- add support for trigers from non damage spells

- Support correct log for spell misses/resisted/dodge/immuned and e.t.c

- Support correct log for shields damage

- Fixed many nondummy spell triggers

- Do all triggers after every target take all effects

- Do damage after target take all effects (for this damage just calculated in effects)

- Implement support for drop charges (not all, still need drop charges for modifiers by this system)

==============================================

For this i rewrite all code for damage and spell hit result calculation.

Need TODO:

- Implement resists for miss chances

This patch need new table spell_proc_event for extra info:

- Cooldown

- procFlag - rewrite field from dbc (not need, but its used only for 1 spell, for disable trigger from periodic damage)

- procEx - info about crits, dodges, block, and e.t.c.

For which repository revision was the patch created?

The backport is made for the revision : e7d587f413fb492a4580c069b1d419c6f566917a of the branch mangos-0.12

I've found a thread which request this patch : http://getmangos.eu/community/showthread.php?6314-Procflag

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

The original patch was made by DiSlord,

my work is based on the patch of KAPATEJIb : http://github.com/kpw/kpw/blob/master/31_procflag.patch

Final work : MiLk <[email protected]>

Code :

http://pastebin.com/VL6RjkBP

mirror : http://www.mangos.fr/procflag.patch

You need to apply a sql file : http://github.com/kpw/kpw/blob/master/SQL/mangos_new_spell_proc_event.sql

Milk13 · May 7, 2010

Update for 07c392d29c00c51e3158af0b200588e8b522fb88 : http://pastebin.com/DPBt1VzA

Milk13 · May 21, 2010

Update for 2a985c6bf0e58ac430a4e28c1ea418d7b29fe69c : http://pastebin.com/R32j5Z95

Milk13 · May 21, 2010

I made some checks on database between TBC and WoTLK

I found these spells wich are in TBC and not WoTLK.

Milk13 · May 21, 2010

And these spells wich are in WoTLK and not in TBC :

CHEGOK · May 25, 2010

Nice, very nice, but...

Items enchants procs in 19 times more often =)

I think u need to drop this string:

for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++)

Variable i do nothing in the loop, but in the end increes proc chance.

Milk13 · May 27, 2010

It's for counting the equipment slot in the loop.

VladimirMangos · May 29, 2010

Just for clarify: patch backport only original changes + compatibility fixes? So after ti apply can be looked other commits for backporting... or it include some later commits...

Any known porblems with patch use?

I plan look (if i will interrupted by someone another, feel free ping me in PM ) and review if all ok...

mns · May 29, 2010

I will researching related commit and create new compatible backporting patch

some related commits :

9347

9323

7465

7025

9774

7701

8426

9324

8329

7330

this commits backporting by you (Vladimir) But with some conflict to procflag commit .

this backporting is very hard , but i'm very stubborn

Milk13 · May 29, 2010

My patch is not a real backport, it's the original patch from DiSlord wich was adapted to the last rev of mangos-0.12.

I think that the procflags of WoTLK are very differents of BC and it's not necessary to make a real backport.

I've no problem with this patch for 2 years.

VladimirMangos · May 29, 2010

I understand, and agree that no reason do true backport. I only attempt understand what will need do after it adding to 0.12 in connection with later proc spell ralted changes.

In general in some cases "backports" in fact recreating similar changes in old client context instead backporting. So backporting API (same high level calls and enum names but different implemention and diff enum values)

VladimirMangos · May 29, 2010

http://gist.github.com/418428

Version of patch updated to 19b563e8de89b875d28eb32459a8bb58fdbb2d46

with small warning fixes

VladimirMangos · May 30, 2010

I am update gist with UI64LIN use instead explicit *LL values that not used long time in master already.

But my worry for proc flags use code...

For example

PROC_FLAG_SUCCESSFUL_MELEE_HIT = 0x00000004, // 02 Successful melee auto attack
PROC_FLAG_SUCCESSFUL_MELEE_SPELL_HIT = 0x00000010, // 04 Successful attack by Spell that use melee weapon

Master version propertly sort melee spell use and auto attacks by this flags

suggested patch drop this different and use spell version only...

As i check many 2.4.3 spells have only non-spell version (same as in master) when expected triggering by autoattack only

VladimirMangos · May 30, 2010

Ah, sorry, jumping by code wrongly refer to melee, ofc, related to ranged, but i will recheck

VladimirMangos · May 30, 2010

Yes, ranged related.

For example http://www.wowhead.com/spell=27786 ( triggered bonus http://www.wowhead.com/itemset=186 existed in 2.4.3 and 3.x)

have _only_ plain ranged flag.

Or for example 34497 and ranks have only spell version (logicaly, it return mana cost of spell ranged shots)

VladimirMangos · May 30, 2010

I add to gist sql update in to more readable (master like hex using form)

VladimirMangos · May 31, 2010

As i test attributes, in fact master way selection ranged auto shoot spell exactly same as can be used in mangos 0.12 or for example mangoszero.

I check with this additional chnages and hunter/want shoot work as expected:

diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index e6869d7..ac94ecd 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -288,7 +288,7 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
#define SPELL_ATTR_EX2_CANT_REFLECTED             0x00000004            // 2 ? used for detect can or not spell reflected
#define SPELL_ATTR_EX2_UNK3                       0x00000008            // 3
#define SPELL_ATTR_EX2_UNK4                       0x00000010            // 4
-#define SPELL_ATTR_EX2_UNK5                       0x00000020            // 5
+#define SPELL_ATTR_EX2_AUTOREPEAT_FLAG            0x00000020            // 5
#define SPELL_ATTR_EX2_UNK6                       0x00000040            // 6
#define SPELL_ATTR_EX2_UNK7                       0x00000080            // 7
#define SPELL_ATTR_EX2_UNK8                       0x00000100            // 8 not set in 2.4.2
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 66c7de6..11c4788 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -325,10 +325,7 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, ObjectGuid o
    m_triggeredByAuraSpell  = NULL;

    //Auto Shot & Shoot
-    if( m_spellInfo->AttributesEx2 == 0x000020 && !triggered )
-        m_autoRepeat = true;
-    else
-        m_autoRepeat = false;
+    m_autoRepeat = IsAutoRepeatRangedSpell(m_spellInfo);

    m_powerCost = 0;                                        // setup to correct value in Spell::Prepare, don't must be used before.
    m_casttime = 0;                                         // setup to correct value in Spell::Prepare, don't must be used before.
@@ -647,19 +644,28 @@ void Spell::PrepareDataForTriggerSystem()
            m_procVictim   = PROC_FLAG_TAKEN_MELEE_SPELL_HIT;
            break;
        case SPELL_DAMAGE_CLASS_RANGED:
-            m_procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_SPELL_HIT;
-            m_procVictim   = PROC_FLAG_TAKEN_RANGED_SPELL_HIT;
+            // Auto attack
+            if (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG)
+            {
+                m_procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_HIT;
+                m_procVictim   = PROC_FLAG_TAKEN_RANGED_HIT;
+            }
+            else // Ranged spell attack
+            {
+                m_procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_SPELL_HIT;
+                m_procVictim   = PROC_FLAG_TAKEN_RANGED_SPELL_HIT;
+            }
            break;
        default:
-            if (IsPositiveSpell(m_spellInfo->Id))          // Check for positive spell
+            if (IsPositiveSpell(m_spellInfo->Id))                                 // Check for positive spell
            {
                m_procAttacker = PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL;
                m_procVictim   = PROC_FLAG_TAKEN_POSITIVE_SPELL;
            }
-            else if (m_spellInfo->Id == 5019) // Wands
+            else if (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG) // Wands auto attack
            {
-                m_procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_SPELL_HIT;
-                m_procVictim   = PROC_FLAG_TAKEN_RANGED_SPELL_HIT;
+                m_procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_HIT;
+                m_procVictim   = PROC_FLAG_TAKEN_RANGED_HIT;
            }
            else
            {
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 987a913..6e24818 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -322,6 +322,11 @@ inline bool isSpellBreakStealth(SpellEntry const* spellInfo)
    return !(spellInfo->AttributesEx & SPELL_ATTR_EX_NOT_BREAK_STEALTH);
}

+inline bool IsAutoRepeatRangedSpell(SpellEntry const* spellInfo)
+{
+    return (spellInfo->Attributes & SPELL_ATTR_RANGED) && (spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG);
+}
+
SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32 form);

inline bool IsChanneledSpell(SpellEntry const* spellInfo)
@@ -405,7 +410,7 @@ enum ProcFlags
   PROC_FLAG_KILLED                        = 0x00000001,    // 00 Killed by agressor
   PROC_FLAG_KILL_AND_GET_XP               = 0x00000002,    // 01 Kill that yields experience or honor

-   PROC_FLAG_SUCCESSFUL_MILEE_HIT          = 0x00000004,    // 02 Successful melee attack
+   PROC_FLAG_SUCCESSFUL_MELEE_HIT          = 0x00000004,    // 02 Successful melee attack
   PROC_FLAG_TAKEN_MELEE_HIT               = 0x00000008,    // 03 Taken damage from melee strike hit

   PROC_FLAG_SUCCESSFUL_MELEE_SPELL_HIT    = 0x00000010,    // 04 Successful attack by Spell that use melee weapon
@@ -439,7 +444,7 @@ enum ProcFlags
   PROC_FLAG_SUCCESSFUL_OFFHAND_HIT        = 0x00800000     // 23 Successful off-hand melee attacks
};

-#define MELEE_BASED_TRIGGER_MASK (PROC_FLAG_SUCCESSFUL_MILEE_HIT        | \\
+#define MELEE_BASED_TRIGGER_MASK (PROC_FLAG_SUCCESSFUL_MELEE_HIT        | \\
                                  PROC_FLAG_TAKEN_MELEE_HIT             | \\
                                  PROC_FLAG_SUCCESSFUL_MELEE_SPELL_HIT  | \\
                                  PROC_FLAG_TAKEN_MELEE_SPELL_HIT       | \\
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 4856351..9523f96 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -1809,12 +1809,12 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
    switch (attackType)
    {
        case BASE_ATTACK:
-            damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_MILEE_HIT;
+            damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_MELEE_HIT;
            damageInfo->procVictim   = PROC_FLAG_TAKEN_MELEE_HIT;
            damageInfo->HitInfo      = HITINFO_NORMALSWING2;
            break;
        case OFF_ATTACK:
-            damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_MILEE_HIT | PROC_FLAG_SUCCESSFUL_OFFHAND_HIT;
+            damageInfo->procAttacker = PROC_FLAG_SUCCESSFUL_MELEE_HIT | PROC_FLAG_SUCCESSFUL_OFFHAND_HIT;
            damageInfo->procVictim   = PROC_FLAG_TAKEN_MELEE_HIT;//|PROC_FLAG_TAKEN_OFFHAND_HIT // not used
            damageInfo->HitInfo = HITINFO_LEFTSWING;
            break;

Including only auto attack triggered spell http://www.wowhead.com/spell=27786

I not check is in all cases this flag used in table in cases where procflags overwrited

[edited] as i check no 0x100 cases i overwrited flags except one spell only case (that now will NOT triggered as expected at autoshot/shot).

VladimirMangos · May 31, 2010

With described changes added to mangos-0.12 repo. Milk13, thank you for big work

From adding original patch to master many changes has been added with local fixes and improvments.

If you find any useful you can post commit hashs and i will backport commit. Better go from past to present step by step.

VladimirMangos · June 3, 2010

Nice, very nice, but...
Items enchants procs in 19 times more often =)

I think u need to drop this string:

for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++)

Variable i do nothing in the loop, but in the end increes proc chance.

You has been right, and i fix this by reapply related commit after spell proc patch backporting in cc629fdb6750dad6f085986223cd0b7f9fbed026.

This is must fix recent "100% apply" poisons problem.

Thank you

Sign In

[added][backport/mangos-0.12]ProcFlag backported for mangos-0.12

Recommended Posts

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Recently Browsing 0 members

Contact Us

Repositories

Important Information