Sarjuuk

yay, for more visual appeal (: for master @ 1f4ddbf71ad2ef824b30aa0a639685f2ed61601c : http://paste2.org/p/691723 for 0.12 @ 66809ac9576d359c416b442c3104819ba287b72a : http://paste2.org/p/691730 it would be nice, if someone with a player-base, could actually test the master-version a bit more in depths. /e: got SegFaults .. apparently GetCaster() can be NULL..... diffs updated manually. Thanks to DasMy, for throwing crashlogs at me.

next try: compiles nicely and on first sight no side effects. http://paste2.org/p/689424 for mangos-0.12 @ 889abb0ab54824b7aeeebb6af257ab6054d0db65 I do still plan do adapt it for master. Most Excludes wouldn't be needed for 0.12 I still don' know how to handle Executioner in a nice way...

no, thats highly unlikely :] imagine 2x 50% reduced healing .. the QQ would be absurd^^ I think, what the tooltip means is, that, rather adding another application ontop of a full stack, the poison of the other weapon is allowed to proc. But thats just an idea. I read this addition to deadly poison for the first time

ah... i got a notice, that this patch has an logical error and allows Rogue-Poisons to stack per Weapon ie. 2x5 Wound-Poison or 2x Mind-Numbing. sorry again >.<

First of all .. afaik none of the code above is in master. And what do you mean with "disables maul to contribute from bleeding effects" the opposite should be the case oO

got finally around to test this. Weapon cast buffs are stacking, other item-cast Auras are not. diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 6d02ea4..e078127 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -849,8 +849,9 @@ void Aura::_AddAura() Unit::spellEffectPair spair = Unit::spellEffectPair(GetId(), i); for(Unit::AuraMap::const_iterator itr = m_target->GetAuras().lower_bound(spair); itr != m_target->GetAuras().upper_bound(spair); ++itr) { - // allow use single slot only by auras from same caster - if(itr->second->GetCasterGUID()==GetCasterGUID()) + // allow use single slot only by auras from same caster (and item) + if (itr->second->GetCasterGUID() == GetCasterGUID() && + itr->second->GetCastItemGUID() == GetCastItemGUID()) { samespell = true; if (m_effIndex > itr->second->GetEffIndex()) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 076f6e7..fd3d0a5 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3657,11 +3657,25 @@ bool Unit::AddAura(Aura *Aur) // if StackAmount==0 not allow auras from same caster else { + bool isWeaponCastAura = false; + if (GetTypeId() == TYPEID_PLAYER) + { + if (Item* castItem = ((Player*)this)->GetItemByGuid(Aur->GetCastItemGUID())) + { + if (castItem->GetPos() == ((INVENTORY_SLOT_BAG_0<<8) + EQUIPMENT_SLOT_MAINHAND) || + castItem->GetPos() == ((INVENTORY_SLOT_BAG_0<<8) + EQUIPMENT_SLOT_OFFHAND)) + isWeaponCastAura = true; + } + } for(AuraMap::iterator i2 = m_Auras.lower_bound(spair); i2 != m_Auras.upper_bound(spair); ++i2) { Aura* aur2 = i2->second; if(aur2->GetCasterGUID()==Aur->GetCasterGUID()) { + // proced Auras may stack, if their Source-Item differ + if (aur2->GetCastItemGUID() != Aur->GetCastItemGUID() && isWeaponCastAura) + continue; + // Carry over removed Aura's remaining damage if Aura still has ticks remaining if (!aurSpellInfo->StackAmount && aur2->GetSpellProto()->AttributesEx4 & SPELL_ATTR_EX4_STACK_DOT_MODIFIER && aurName == SPELL_AURA_PERIODIC_DAMAGE && aur2->GetAuraDuration() > 0) I'll try to get this for master too.

your worries were justified. This does indeed allow Elixirs and Scrolls to stack >_> sorry

it is. on second thought, i could have sworn, i noticed this error before ... somewhere

this should work for most spells, but not all of them. some spells (as a whole) don't have BLEED as a mechanic, but one of their three effects may have it. So, GetAllSpellMechanicMask(proto) is used to check this

Well, thats a nice find, and just in time for Christmas too And it's simple enough. Why do you think it may be wrong in doing so? :>

aaarg..! thats not what i meant This Talent got intentionally changed, to prevent Powershifting: For example, you depleted your energy and instead of waiting for it to regenerate, you could shift out and in Cat Form again, to have a chance of (20*rank)% to set your energy to 40. Simple trading of Mana for Energy. How it works now (r9040): You powershift and have a chance of 100% to set your energy to 20*rank. (effectively 100) So, it just got worse... How it should work: Think of it, like Mana. You cant see it, but its still there and regenerating after the usual rules (5sec-Spirit-regen. ect) Lets asume, you have 3/5 points in this talent ("[..]you keep up to 60 Energy[..]") and shift out of Cat Form to cast a spell with 2sec casttime, to shift into Cat Form immediately after. with 60 Energy out: - regenerates 20 Energy while casting - now 80 Energy > 60 allowed by Talent => Energy is set to 60 with 40 Energy out: - still 20 energy silently regenerated while casting the spell. - now 60 Energy = 60 allowed by Talent => Final outcome is 60 with 20 Energy out: - regenerates 20 Energy while out of Form - now 40 Energy < 60 Allowed by Talent => Energy is left at 40 I hope, that made it clearer

does not.. hmm, strange. i could have sworn healing was still increased correctly, when this spell was commented out.

confirmed working. for both mangos-0.12 and master Thank you

I don't know why it does not here either... In any case, EffectMultipleValue can be zero and this case has to be caught somehow or unfortunate things will happen :]

What bug does the patch fix? Units with this aura being oneshotted by magic damage (yes this one is actually used by SD2 (or at least should be^^)) For which repository revision was the patch created? r8958 Is there a thread in the bug report section or at lighthouse? was reported via IRC Who has been writing this patch? me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 70837d2..7817993 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1995,12 +1995,18 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe currentAbsorb = RemainingDamage; float manaMultiplier = (*i)->GetSpellProto()->EffectMultipleValue[(*i)->GetEffIndex()]; - if(Player *modOwner = pVictim->GetSpellModOwner()) - modOwner->ApplySpellMod((*i)->GetId(), SPELLMOD_MULTIPLE_VALUE, manaMultiplier); + if(manaMultiplier) + { + if(Player *modOwner = pVictim->GetSpellModOwner()) + modOwner->ApplySpellMod((*i)->GetId(), SPELLMOD_MULTIPLE_VALUE, manaMultiplier); + + int32 maxAbsorb = int32(pVictim->GetPower(POWER_MANA) / manaMultiplier); + if (currentAbsorb > maxAbsorb) + currentAbsorb = maxAbsorb; - int32 maxAbsorb = int32(pVictim->GetPower(POWER_MANA) / manaMultiplier); - if (currentAbsorb > maxAbsorb) - currentAbsorb = maxAbsorb; + int32 manaReduction = int32(currentAbsorb * manaMultiplier); + pVictim->ApplyPowerMod(POWER_MANA, manaReduction, false); + } (*i)->GetModifier()->m_amount -= currentAbsorb; if((*i)->GetModifier()->m_amount <= 0) @@ -2009,9 +2015,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe next = vManaShield.begin(); } - int32 manaReduction = int32(currentAbsorb * manaMultiplier); - pVictim->ApplyPowerMod(POWER_MANA, manaReduction, false); - RemainingDamage -= currentAbsorb; } ok, that implies, that an EffectMultipleValue of zero means, that no mana should be drained... hmm /e: on second thought. Maybe it should be checked if the Unit has POWER_MANA..?

there isn't much room for variance, with this change. Besides my goal was to supply a conform patch-file in a conform thread-format, so this doesn't get overlooked. It was not intended to be a whole new approach.

sounds like heart of the wild and the dodge buff are exclusive.. hmmm, i'll take a look

i would have looked for other similar bugged relics first, but meehhh^^

Your right, they're no Auras. So when cast at someone/-thing, you have to catch the spellcast in Spell::EffectScriptEffect() and write what should happen there manually. ie: if there are "extension-charges" (which i added to Aura) left, decrement those and extend the Duration of the Aura by X seconds. But i didn't get it to work without those 'charges', so this patch will most likely stay custom content

you could still reuse it for MaNGOS's anniversary :lol:

Dont mess them up... [Glyph of Nourish] Your Nourish heals an additional 6% for each of your heal over time effects present on the target. [Nourish Heal Boost] Your Nourish heals an additional 5% for each of your heal over time effects present on the target.

from reading i'm sure they should not affect Greater Blessing of X (Thorns is out of question) From a look into the Spell.dbc i now realize, that the FamilyFlags of Blessings and Greater Blessings are identical. So its more than likely, that this patch will affect Greater Blessings whereras it should not.... oh well... /e: fixed

and here is your patchfile diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 24354a8..a880583 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10689,6 +10689,37 @@ int32 Unit::CalculateSpellDuration(SpellEntry const* spellProto, uint8 effect_in else duration = minduration; + if (unitPlayer && target == this) + { + switch(spellProto->SpellFamilyName) + { + case SPELLFAMILY_DRUID: + if (spellProto->SpellFamilyFlags & UI64LIT(0x100)) + { + // Glyph of Thorns + if (Aura *aur = GetAura(57862, 0)) + duration += aur->GetModifier()->m_amount * MINUTE * IN_MILISECONDS; + } + break; + case SPELLFAMILY_PALADIN: + if (spellProto->SpellIconID == 298 && spellProto->SpellFamilyFlags & UI64LIT(0x00000002)) + { + // Glyph of Blessing of Might + if (Aura *aur = GetAura(57958, 0)) + duration += aur->GetModifier()->m_amount * MINUTE * IN_MILISECONDS; + } + else if (spellProto->SpellIconID == 306 && spellProto->SpellFamilyFlags & UI64LIT(0x00010000)) + { + // Glyph of Blessing of Wisdom + if (Aura *aur = GetAura(57979, 0)) + duration += aur->GetModifier()->m_amount * MINUTE * IN_MILISECONDS; + } + break; + default: + break; + } + } + if (duration > 0) { int32 mechanic = GetEffectMechanic(spellProto, effect_index);

right, i give up^^ what i tried was to: extend m_maxduration too to +X seconds like m_duration to have a reference before each possible extend, calculate the regular maximum SpellDuration with ->CalculateSpellDuration() if m_maxduration is equal or larger than the just calculated duration plus three times the Glyphs modifier in ms, do not extend any more. Works on paper, but does not in reality, since Ruptures duration can't be recalculated as it was based upon Combo Points that got used up So, i'm out of ideas .. again

working diff for: master @ b9d2db3a3737ec795b34fb755851c0c65afd5999 [Download] For some reason the Glyph-Spell has retained its BasePoints through the Duration/Cooldown-halving by 'BigB' I guessed it's a bug, sooo, additional halving for this spell^^