laise

update for 9531 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 9fe0d9f..d275558 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5678,6 +5678,17 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu pVictim->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_DAMAGE_PERCENT); return true; } + // Blessing of Ancient Kings + case 64411: + { + // for DOT procs + if (!IsPositiveSpell(procSpell->Id)) + return false; + + triggered_spell_id = 64413; + basepoints[0] = damage * 15 / 100; + break; + } } break; }

updated for 9516 http://paste2.org/p/702661 sqls in first post

update for 3.3.2 rev 9516 if anyone needs: http://paste2.org/p/702466

this is only the base - doesn't include any spell specific handle in core mods until full spell support is added, currently need testing (kind of alpha version) left to do: -make summoned pet created from effect and loaded from db same with all properties -not sure what to do with pet saving/loading - is it really needed for this type of pets? -later add spell specific support - pet spells/auras etc. part 1 - http://paste2.org/p/699401 allows to create more than 1 pet and adds GetCreator method for later use when actual player is needed part 2 - http://paste2.org/p/699402 changes pet movement - follow angle and stat sync between chained pet and player, also replace dead first pet by second in chain part 3 - http://paste2.org/p/699403 pet cast bar for all pets and small fixes - maybe later i will add 1 with all this, currently just need to apply all 3

updated for 9457 http://pastebin.com/2yMNbcqE sql: -- (48266) Blood Presence () DELETE FROM `spell_proc_event` WHERE `entry` IN (48266); INSERT INTO `spell_proc_event` VALUES (48266, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00050014, 0x00010000, 0.000000, 0.000000, 0); -- (63611) Improved Blood Presence () DELETE FROM `spell_proc_event` WHERE `entry` IN (63611); INSERT INTO `spell_proc_event` VALUES (63611, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00050014, 0x00010000, 0.000000, 0.000000, 0);

What bug does the patch fix? What features does the patch add? fixes 2/4 pieces bonuses For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index ea12dcd..d090c2d 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp@@ -6981,7 +6999,14 @@ void Aura::PeriodicTick() { int32 ticks = GetAuraMaxTicks(); int32 remainingTicks = ticks - GetAuraTicks(); - pdamage = int32(pdamage) + int32(amount)*ticks*(-6+2*remainingTicks)/100; + int32 addition = int32(amount)*ticks*(-6+2*remainingTicks)/100; + + if (GetAuraTicks() != 1) + // Item - Druid T10 Restoration 2P Bonus + if (Aura *aura = pCaster->GetAura(70658, EFFECT_INDEX_0)) + addition += abs(int32((addition * aura->GetModifier()->m_amount) / ((ticks-1)* 100))); + + pdamage = int32(pdamage) + addition; } } diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 3d02a0c..01331e0 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4968,7 +4968,7 @@ bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu case 13877: case 33735: { - target = SelectNearbyTarget(pVictim); + target = SelectRandomUnfriendlyTarget(pVictim); if(!target) return false; basepoints0 = damage; @@ -5111,7 +5111,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu if(procSpell && procSpell->Id == 26654) return false; - target = SelectNearbyTarget(pVictim); + target = SelectRandomUnfriendlyTarget(pVictim); if(!target) return false; @@ -5686,7 +5686,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu if(procSpell && procSpell->Id == 26654) return false; - target = SelectNearbyTarget(pVictim); + target = SelectRandomUnfriendlyTarget(pVictim); if(!target) return false; @@ -6069,6 +6069,28 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 54755; break; } + // Item - Druid T10 Restoration 4P Bonus (Rejuvenation) + case 70664: + { + if (!procSpell || GetTypeId() != TYPEID_PLAYER) + return false; + + float radius; + if (procSpell->EffectRadiusIndex[EFFECT_INDEX_0]) + radius = GetSpellRadius(sSpellRadiusStore.LookupEntry(procSpell->EffectRadiusIndex[EFFECT_INDEX_0])); + else + radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(procSpell->rangeIndex)); + + ((Player*)this)->ApplySpellMod(procSpell->Id, SPELLMOD_RADIUS, radius,NULL); + + Unit *second = pVictim->SelectRandomFriendlyTarget(pVictim, radius); + + if (!second) + return false; + + pVictim->CastSpell(second, procSpell, true, NULL, triggeredByAura, GetGUID()); + return true; + } // Item - Druid T10 Balance 4P Bonus case 70723: { @@ -13057,7 +13079,7 @@ void Unit::UpdateReactives( uint32 p_time ) } } -Unit* Unit::SelectNearbyTarget(Unit* except /*= NULL*/) const +Unit* Unit::SelectRandomUnfriendlyTarget(Unit* except /*= NULL*/, float radius /*= ATTACK_DISTANCE*/) const { CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY())); Cell cell(p); @@ -13066,14 +13088,62 @@ Unit* Unit::SelectNearbyTarget(Unit* except /*= NULL*/) const std::list<Unit *> targets; - MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, ATTACK_DISTANCE); + MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, radius); MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck> searcher(this, targets, u_check); TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyUnitInObjectRangeCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); - cell.Visit(p, world_unit_searcher, *GetMap(), *this, ATTACK_DISTANCE); - cell.Visit(p, grid_unit_searcher, *GetMap(), *this, ATTACK_DISTANCE); + cell.Visit(p, world_unit_searcher, *GetMap(), *this, radius); + cell.Visit(p, grid_unit_searcher, *GetMap(), *this, radius); + + // remove current target + if(except) + targets.remove(except); + + // remove not LoS targets + for(std::list<Unit *>::iterator tIter = targets.begin(); tIter != targets.end() + { + if(!IsWithinLOSInMap(*tIter)) + { + std::list<Unit *>::iterator tIter2 = tIter; + ++tIter; + targets.erase(tIter2); + } + else + ++tIter; + } + + // no appropriate targets + if(targets.empty()) + return NULL; + + // select random + uint32 rIdx = urand(0,targets.size()-1); + std::list<Unit *>::const_iterator tcIter = targets.begin(); + for(uint32 i = 0; i < rIdx; ++i) + ++tcIter; + + return *tcIter; +} + +Unit* Unit::SelectRandomFriendlyTarget(Unit* except /*= NULL*/, float radius /*= ATTACK_DISTANCE*/) const +{ + CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY())); + Cell cell(p); + cell.data.Part.reserved = ALL_DISTRICT; + cell.SetNoCreate(); + + std::list<Unit *> targets; + + MaNGOS::AnyFriendlyUnitInObjectRangeCheck u_check(this, this, radius); + MaNGOS::UnitListSearcher<MaNGOS::AnyFriendlyUnitInObjectRangeCheck> searcher(this, targets, u_check); + + TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyFriendlyUnitInObjectRangeCheck>, WorldTypeMapContainer > world_unit_searcher(searcher); + TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyFriendlyUnitInObjectRangeCheck>, GridTypeMapContainer > grid_unit_searcher(searcher); + + cell.Visit(p, world_unit_searcher, *GetMap(), *this, radius); + cell.Visit(p, grid_unit_searcher, *GetMap(), *this, radius); // remove current target if(except) diff --git a/src/game/Unit.h b/src/game/Unit.h index 158903a..475a632 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1128,7 +1128,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject void CombatStop(bool includingCast = false); void CombatStopWithPets(bool includingCast = false); void StopAttackFaction(uint32 faction_id); - Unit* SelectNearbyTarget(Unit* except = NULL) const; + Unit* SelectRandomUnfriendlyTarget(Unit* except = NULL, float radius = ATTACK_DISTANCE) const; + Unit* SelectRandomFriendlyTarget(Unit* except = NULL, float radius = ATTACK_DISTANCE) const; bool hasNegativeAuraWithInterruptFlag(uint32 flag); void SendMeleeAttackStop(Unit* victim); void SendMeleeAttackStart(Unit* pVictim); insert into `spell_proc_event` where `entry` = 70664 insert into `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) values('70664','0','7','16','0','0','0','0','0','2','0');

is there any other similar spells that can be casted while casting another spell?

What bug does the patch fix? What features does the patch add? fixes of 2p set bonus and fix 4p set bonus (not includes gcd part) For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 0611853..0cb960c 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2602,6 +2602,15 @@ void Spell::cast(bool skipCheck) AddPrecastSpell(41425); // Hypothermia break; } + case SPELLFAMILY_WARRIOR: + { + // Item - Warrior T10 Melee 4P Bonus + if (m_spellInfo->Id == 46916 || m_spellInfo->Id == 52437) + if (Aura *aur = m_caster->GetAura(70847, EFFECT_INDEX_0)) + if (roll_chance_i(aur->GetModifier()->m_amount)) + AddTriggeredSpell(70849); + break; + } case SPELLFAMILY_PRIEST: { // Power Word: Shield /*Item - Warrior T10 Melee 2P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70854; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70854','0','5','0',0x00000010,'0','0','0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes proc of warlock t10 4p set bonus For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me /*Item - Warlock T10 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70841; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70841','0','5',0x00000004,0x00000100,'0','0','0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes 2p proc and 4p cast on 5 Maelstrom Weapon stack For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index d0193c5..3d02a0c 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7976,6 +7976,15 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB // 5 rank -> 100% 4 rank -> 80% and etc from full rate if(!roll_chance_i(20*rank)) return false; + + // Item - Shaman T10 Enhancement 4P Bonus + if (Aura *aur = GetAura(70832, EFFECT_INDEX_0)) + { + Aura *maelBuff = GetAura(trigger_spell_id, EFFECT_INDEX_0); + if (maelBuff && maelBuff->GetStackAmount() + 1 == maelBuff->GetSpellProto()->StackAmount) + if (roll_chance_i(aur->GetModifier()->m_amount)) + CastSpell(this, 70831, true, NULL, aur); + } break; } // Brain Freeze /*Item - Shaman T10 Enhancement 2P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70830; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70830','0','11','0',0x00020000,'0',0x00004000,'0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes proc and Flame Shock duration increase For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 002a59d..d0193c5 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6740,6 +6740,18 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 70809; break; } + // Item - Shaman T10 Elemental 4P Bonus + case 70817: + { + if (Aura *aur = pVictim->GetAura(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_SHAMAN, UI64LIT(0x0000000010000000), 0, GetGUID())) + { + int32 amount = aur->GetAuraDuration() + triggerAmount * IN_MILISECONDS; + aur->SetAuraDuration(amount); + aur->SendAuraUpdate(false); + return true; + } + return false; + } } // Storm, Earth and Fire if (dummySpell->SpellIconID == 3063) /*Item - Shaman T10 Elemental 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70817; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70817','0','11','0',0x00001000,'0',0x00010000,'0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes 2/4 pieces bonuses of rogue t10 set For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 45ad4e9..002a59d 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7572,6 +7572,14 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB } break; } + case SPELLFAMILY_ROGUE: + // Item - Rogue T10 2P Bonus + if (auraSpellInfo->Id == 70805) + { + if (pVictim != this) + return false; + } + break; case SPELLFAMILY_HUNTER: // Piercing Shots if (auraSpellInfo->SpellIconID == 3247 && auraSpellInfo->SpellVisual[0] == 0) /*Item - Rogue T10 2P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70805; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70805','0','8','0',0x00020000,'0',0x00004000,'0','0','0','0'); /*Item - Rogue T10 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70803; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70803','0','8','4063232','0','0','0','0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes Divine Storm cooldown reset for 2p set bonus For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index effa97a..45ad4e9 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6541,6 +6541,15 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu target = this; break; } + // Item - Paladin T10 Retribution 2P Bonus + case 70765: + { + if (GetTypeId() != TYPEID_PLAYER) + return false; + + ((Player*)this)->RemoveSpellCooldown(53385, true); + return true; + } } break; }

What bug does the patch fix? What features does the patch add? fixes procs of paladin(holy/protection) & hunter & death knight t10 set bonus procs For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me /*Item - Death Knight T10 Tank 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70652; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70652','0','15',0x00000008,'0','0',0x00004000,'0','0','0','0'); /*Item - Paladin T10 Protection 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70761; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70761','0','10','0',0x80004000,'0',0x00004000,'0','0','0','0'); /*Item - Paladin T10 Holy 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70756; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70756','0','10',0x00200000,'0','0',0x00004000,'0','0','0','0'); /*Item - Hunter T10 2P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70727; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70727','0','9',0x00000001,'0','0','0','0','0','0','0'); /*Item - Hunter T10 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70730; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70730','0','9',0x00004000,0x00001000,'0','0','0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes 2/4 pieces bonuses For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 1a64ecc..ea12dcd 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -6046,6 +6046,20 @@ void Aura::HandleSpellSpecificBoosts(bool apply) else return; } + // Item - Mage T10 2P Bonus + else if (m_spellProto->Id == 57761 || m_spellProto->Id == 48108 || m_spellProto->Id == 44401) + { + Unit* caster = GetCaster(); + if(!caster) + return; + + // consumed = ? + if (!apply && m_removeMode == AURA_REMOVE_BY_DEFAULT && m_duration != 0 && caster->HasAura(70752)) + { + cast_at_remove = true; + spellId1 = 70753; + } + } else return; break; /*Item - Mage T10 4P Bonus*/ DELETE FROM `spell_proc_event` WHERE entry = 70748; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70748','0','3','0',0x00200000,'0','0','0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes 2/4 pieces bonuses For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index ce1e8ed..0611853 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2632,6 +2632,9 @@ void Spell::cast(bool skipCheck) // Faerie Fire (Feral) if (m_spellInfo->Id == 16857 && m_caster->m_form != FORM_CAT) AddTriggeredSpell(60089); + // Item - Druid T10 Balance 2P Bonus + else if (m_spellInfo->Id == 16870 && m_caster->HasAura(70718)) + AddTriggeredSpell(70721); break; } case SPELLFAMILY_ROGUE: diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 0eb6282..effa97a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6069,6 +6069,14 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 54755; break; } + // Item - Druid T10 Balance 4P Bonus + case 70723: + { + basepoints0 = int32( triggerAmount * damage / 100 ); + basepoints0 = int32( basepoints0 / 2); + triggered_spell_id = 71023; + break; + } } // Eclipse if (dummySpell->SpellIconID == 2856) DELETE FROM `spell_proc_event` WHERE entry = 70723; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70723','0','7',0x00000005,'0','0','0','2','0','0','0');

What bug does the patch fix? What features does the patch add? fixes Advantage cast only when all runes on cd For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 80fc804..0eb6282 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7812,6 +7812,16 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB if (procSpell->Id != 47633) return false; } + // Item - Death Knight T10 Melee 4P Bonus + else if (auraSpellInfo->Id == 70656) + { + if (GetTypeId() != TYPEID_PLAYER || getClass() != CLASS_DEATH_KNIGHT) + return false; + + for(uint32 i = 0; i < MAX_RUNES; ++i) + if (((Player*)this)->GetRuneCooldown(i) == 0) + return false; + } // Blade Barrier else if (auraSpellInfo->SpellIconID == 85) { has same spell icon as Blade Barrier =\\

What bug does the patch fix? What features does the patch add? fixes healing over time after chain heal crit & other set bonuses where DoT had wrong tick amount For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5a30d82..80fc804 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6703,6 +6703,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu case 64928: { basepoints0 = int32( triggerAmount * damage / 100 ); + basepoints0 = int32( basepoints0 / 2); // basepoints is for 1 tick, not all DoT amount triggered_spell_id = 64930; // Electrified break; } @@ -6710,9 +6711,18 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu case 67228: { basepoints0 = int32( triggerAmount * damage / 100 ); + basepoints0 = int32( basepoints0 / 3); // basepoints is for 1 tick, not all DoT amount triggered_spell_id = 71824; break; } + // Item - Shaman T10 Restoration 4P Bonus + case 70808: + { + basepoints0 = int32( triggerAmount * damage / 100 ); + basepoints0 = int32( basepoints0 / 3); // basepoints is for 1 tick, not all DoT amount + triggered_spell_id = 70809; + break; + } } // Storm, Earth and Fire if (dummySpell->SpellIconID == 3063) DELETE FROM `spell_proc_event` WHERE entry = 70808; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70808','0','11',0x00000100,'0','0','0','2','0','0','0'); i think its more clear to have basepoint0 separate calculations - 1 for general amount and split for 1 tick after

What bug does the patch fix? What features does the patch add? fixes absorb apply on bloodrage cast For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 97e998c..1a64ecc 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -6068,7 +6068,17 @@ void Aura::HandleSpellSpecificBoosts(bool apply) spellId1 = 30069; // Blood Frenzy (Rank 1) spellId2 = 30070; // Blood Frenzy (Rank 2) - } + } + else + { + // Bloodrage & Item - Warrior T10 Protection 4P Bonus + if (GetId() == 29131 && m_target->HasAura(70844)) + { + int32 bp = int32(m_target->GetMaxHealth() * 20 / 100); + m_target->CastCustomSpell(m_target, 70845, &bp, NULL, NULL, true, NULL, this); + return; + } + } break; } case SPELLFAMILY_WARLOCK: idk if it should be removed when bloodrage is removed

What bug does the patch fix? What features does the patch add? fixes cooldown remove and proc for 4p set bonus For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 7e5f068..5a30d82 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5947,6 +5947,20 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 56131; break; } + // Item - Priest T10 Healer 4P Bonus + case 70799: + { + if (GetTypeId() != TYPEID_PLAYER) + return false; + + // Circle of Healing + ((Player*)this)->RemoveSpellCategoryCooldown(1204, true); + + // Penance + ((Player*)this)->RemoveSpellCategoryCooldown(1230, true); + + return true; + } } break; } DELETE FROM `spell_proc_event` WHERE entry = 70799; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('70799','0','6',0x00000800,'0','0','0','0','0','0','0');

What bug does the patch fix? What features does the patch add? fixes defense increase when using enrage with t10 For which repository revision was the patch created? 9427 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index c9f9cd7..97e998c 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -6187,6 +6187,15 @@ void Aura::HandleSpellSpecificBoosts(bool apply) } break; } + case SPELLFAMILY_DRUID: + { + // Item - Druid T10 Feral 4P Bonus + if (GetId() == 5229 && m_target->HasAura(70726))// Enrage + spellId1 = 70725; + else + return; + break; + } case SPELLFAMILY_ROGUE: // Sprint (skip non player casted spells by category) if (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000000000000040) && GetSpellProto()->Category == 44)

What bug does the patch fix? What features does the patch add? fixes Brambles - Daze proc for Barkskin & Thorns damage For which repository revision was the patch created? 9383 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me iff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 8f1a34f..79e4fa6 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1701,6 +1701,23 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss) alreadyDone.insert(*i); uint32 damage=(*i)->GetModifier()->m_amount; SpellEntry const *i_spellProto = (*i)->GetSpellProto(); + + // Thorns + if (i_spellProto->SpellFamilyName == SPELLFAMILY_DRUID && i_spellProto->SpellFamilyFlags & UI64LIT(0x00000100)) + { + Unit::AuraList const& dummyList = pVictim->GetAurasByType(SPELL_AURA_DUMMY); + for(Unit::AuraList::const_iterator iter = dummyList.begin(); iter != dummyList.end(); ++iter) + { + // Brambles + if((*iter)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID && + (*iter)->GetSpellProto()->SpellIconID == 53) + { + damage += uint32(damage * (*iter)->GetModifier()->m_amount / 100); + break; + } + } + } + //Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist? //uint32 absorb; //uint32 resist; sql: DELETE FROM `spell_proc_event` WHERE entry = 22812; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('22812','0','0','0','0','0','0','3','0','0','0');

because 100% is not real proc chance and needs to be overrided

What bug does the patch fix? What features does the patch add? fixes mana restore chance of Moonkin form (was changed in 3.0 or after) For which repository revision was the patch created? 9383 Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread. haven't seen any Who has been writing this patch? Please include either forum user names or email addresses. me DELETE FROM `spell_proc_event` WHERE entry = 24905; INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES('24905','0','0','0','0','0','0','2','0','50','0');

not confirmed, spell is using melee damage bonus and damage is reduced by armor