Hundekuchen

ohh, I have not thought about "Mark of the Wild" I improve the script, thx

In wow exist only two spells of resistances with"SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE" for one player which is stacking.(2 for every resistance) These increase the green value^^ All other Spells for example the: http://www.wowhead.com/spell=14673 are not spells of this case. Sry for my english I hope I understood any of you questions. edit: and therefore we must consider only two and not all.

What bug does the patch fix? What features does the patch add? it fixes that the following Spells do not overwrite each other --Scroll of Intellect, Arcane Intellect and Arcane Brilliance --Scroll of Stamina, Power Word: Fortitude and Prayer of Fortitude --Scroll of Spirit, Divine Spirit and Prayer of Spirit For which repository revision was the patch created? newest mangos 0.12 Is there a thread in the bug report section or at lighthouse? many threads Who has been writing this patch? Please include either forum user names or email addresses. Me diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index ea7727b..88c1682 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1249,10 +1249,16 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons break; } case SPELLFAMILY_MAGE: + { // Arcane Intellect and Insight if( spellInfo_2->SpellIconID == 125 && spellInfo_1->Id == 18820 ) return false; + //Scroll of Intellect, Arcane Intellect and Arcane Brilliance + if(spellInfo_2->SpellIconID == 125 || spellInfo_2->SpellIconID == 1694 && + (spellInfo_1->SpellIconID == 125 && spellInfo_1->SpellVisual == 158 && spellInfo_1->procChance == 101)) + return true; break; + } case SPELLFAMILY_WARRIOR: { // Scroll of Protection and Defensive Stance (multi-family check) @@ -1308,12 +1314,32 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons break; } + case SPELLFAMILY_PRIEST: + { + //Scroll of Stamina, Power Word: Fortitude and Prayer of Fortitude + if(((spellInfo_2->SpellIconID == 685 || spellInfo_2->SpellIconID == 1669) && spellInfo_2->SpellVisual == 278 ) + && (spellInfo_1->SpellIconID == 312 && spellInfo_1->SpellVisual == 216)) + return true; + //Scroll of Spirit, Divine Spirit and Prayer of Spirit + if(((spellInfo_2->SpellIconID == 1879 || spellInfo_2->SpellIconID == 1870) && spellInfo_2->SpellVisual == 193 ) + && (spellInfo_1->SpellIconID == 208 && spellInfo_1->SpellVisual == 335)) + return true; + break; + } } // Dragonmaw Illusion, Blood Elf Illusion, Human Illusion, Illidari Agent Illusion, Scarlet Crusade Disguise if(spellInfo_1->SpellIconID == 1691 && spellInfo_2->SpellIconID == 1691) return false; break; case SPELLFAMILY_MAGE: + { + if( spellInfo_2->SpellFamilyName == SPELLFAMILY_GENERIC ) + { + //Scroll of Intellect, Arcane Intellect and Arcane Brilliance + if (spellInfo_1->SpellIconID == 125 || spellInfo_1->SpellIconID == 1694 && + (spellInfo_2->SpellIconID == 125 && spellInfo_2->SpellVisual == 158 && spellInfo_2->procChance == 101)) + return true; + } if( spellInfo_2->SpellFamilyName == SPELLFAMILY_MAGE ) { // Blizzard & Chilled (and some other stacked with blizzard spells @@ -1339,6 +1365,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons return false; break; + } case SPELLFAMILY_WARLOCK: if( spellInfo_2->SpellFamilyName == SPELLFAMILY_WARLOCK ) { @@ -1395,6 +1422,18 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons break; case SPELLFAMILY_PRIEST: + { + if( spellInfo_2->SpellFamilyName == SPELLFAMILY_GENERIC ) + { + //Scroll of Stamina, Power Word: Fortitude and Prayer of Fortitude + if (((spellInfo_1->SpellIconID == 685 || spellInfo_1->SpellIconID == 1669) && spellInfo_1->SpellVisual == 278) && + (spellInfo_2->SpellIconID == 312 && spellInfo_2->SpellVisual == 216)) + return true; + //Scroll of Spirit, Divine Spirit and Prayer of Spirit + if (((spellInfo_1->SpellIconID == 1879 || spellInfo_1->SpellIconID == 1870) && spellInfo_1->SpellVisual == 193) && + (spellInfo_2->SpellIconID == 208 && spellInfo_2->SpellVisual == 335)) + return true; + } if( spellInfo_2->SpellFamilyName == SPELLFAMILY_PRIEST ) { //Devouring Plague and Shadow Vulnerability @@ -1408,6 +1447,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons return false; } break; + } case SPELLFAMILY_DRUID: if( spellInfo_2->SpellFamilyName == SPELLFAMILY_DRUID ) {

I have tested it on branch 0.12 and it works fine NPC/Boss - vs -> Player: 50try no crit Player - vs -> NPC/Boss: everything is normal Player - vs -> Player: everything is normal

here the trinity hack, testet on mangos 0.12 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5ca3033..14278f0 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6221,6 +6256,9 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB case 14189: // Seal Fate (Netherblade set) case 14157: // Ruthlessness { + if (!pVictim || pVictim == this) + return false; + // Need add combopoint AFTER finish movie (or they dropped in finish phase) break; } diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index bd4ca17..9ef1ad7 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2434,7 +2443,7 @@ void Spell::cast(bool skipCheck) SendSpellGo(); // we must send smsg_spell_go packet before m_castItem delete in TakeCastItem()... // Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells - if (m_spellInfo->speed > 0.0f) + if (m_spellInfo->speed > 0.0f && !IsChanneledSpell(m_spellInfo) || m_spellInfo->Id == 14189 || m_spellInfo->Id == 14157) { // Remove used for cast item if need (it can be already NULL after TakeReagents call

please comment

okay, but some spell don't work together at time, for example: IconID: 453 http://www.wowhead.com/spell=33089 http://www.wowhead.com/spell=20925 http://www.wowhead.com/spell=45479 Icon: 173 http://www.wowhead.com/spell=19028 http://www.wowhead.com/spell=44415 and many more... And i checked the problem with Scroll of intellect and Arcane intellect and some more, and it works fine My script is only an extra check for incoming spells