Fixes Druid T10 Balance 4P bonus.

Fixes DK T10 Melee 4P bonus.

--HG--
branch : trunk
This commit is contained in:
John Holiver
2010-08-31 15:01:04 -03:00
parent e32ece52ea
commit 258398ed30
3 changed files with 28 additions and 0 deletions
+1
View File
@@ -7445,6 +7445,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 67771, 0x01, 0, 0x00000000, 0x00000000, 0x00000000, 0x00851154, 0x00000003, 0, 35, 45), -- Item - Coliseum Melee Trinket 10men ( 67771, 0x01, 0, 0x00000000, 0x00000000, 0x00000000, 0x00851154, 0x00000003, 0, 35, 45), -- Item - Coliseum Melee Trinket 10men
( 67702, 0x01, 0, 0x00000000, 0x00000000, 0x00000000, 0x00851154, 0x00000003, 0, 35, 45), -- Item - Coliseum Melee Trinket 25men ( 67702, 0x01, 0, 0x00000000, 0x00000000, 0x00000000, 0x00851154, 0x00000003, 0, 35, 45), -- Item - Coliseum Melee Trinket 25men
( 70652, 0x00, 15, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Death Knight T10 Tank 4P Bonus ( 70652, 0x00, 15, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Death Knight T10 Tank 4P Bonus
( 70656, 0x00, 15, 0x00000000, 0x00000000, 0x00000000, 0x00014000, 0x00000000, 0, 0, 0), -- Item - Death Knight T10 Melee 4P Bonus
( 70727, 0x00, 9, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Item - Hunter T10 2P Bonus ( 70727, 0x00, 9, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Item - Hunter T10 2P Bonus
( 70730, 0x00, 9, 0x00004000, 0x00001000, 0x00000000, 0x00040000, 0x00000000, 0, 0, 0), -- Item - Hunter T10 4P Bonus ( 70730, 0x00, 9, 0x00004000, 0x00001000, 0x00000000, 0x00040000, 0x00000000, 0, 0, 0), -- Item - Hunter T10 4P Bonus
( 70748, 0x00, 3, 0x00000000, 0x00200000, 0x00000000, 0x00000400, 0x00000000, 0, 0, 0), -- Item - Mage T10 4P Bonus ( 70748, 0x00, 3, 0x00000000, 0x00200000, 0x00000000, 0x00000400, 0x00000000, 0, 0, 0), -- Item - Mage T10 4P Bonus
@@ -0,0 +1,3 @@
DELETE FROM `spell_proc_event` WHERE entry IN (70656);
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
( 70656, 0x00, 15, 0x00000000, 0x00000000, 0x00000000, 0x00014000, 0x00000000, 0, 0, 0); -- Item - Death Knight T10 Melee 4P Bonus
+24
View File
@@ -6651,6 +6651,20 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
triggered_spell_id = 32747; triggered_spell_id = 32747;
break; break;
} }
// Item - Druid T10 Balance 4P Bonus
case 70723:
{
// Wrath & Starfire
if ((procSpell->SpellFamilyFlags[0] & 0x5) && (procEx & PROC_EX_CRITICAL_HIT))
{
triggered_spell_id = 71023;
SpellEntry const* triggeredSpell = sSpellStore.LookupEntry(triggered_spell_id);
if (!triggeredSpell)
return false;
basepoints0 = int32(triggerAmount * damage / 100 / (GetSpellMaxDuration(triggeredSpell) / triggeredSpell->EffectAmplitude[0]));
}
break;
}
} }
// Eclipse // Eclipse
if (dummySpell->SpellIconID == 2856 && GetTypeId() == TYPEID_PLAYER) if (dummySpell->SpellIconID == 2856 && GetTypeId() == TYPEID_PLAYER)
@@ -7802,6 +7816,16 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
} }
} }
} }
// Item - Death Knight T10 Melee 4P Bonus
if (dummySpell->Id == 70656)
{
if (!this->ToPlayer())
return false;
for (uint32 i = 0; i < MAX_RUNES; ++i)
if (this->ToPlayer()->GetRuneCooldown(i) == 0)
return false;
}
break; break;
} }
case SPELLFAMILY_POTION: case SPELLFAMILY_POTION: