Core/Spells: Fix Onyxia caster trinkets, original idea by Pihtt

Closes #1449
This commit is contained in:
tobmaps
2011-05-17 19:45:45 +07:00
parent 37145b6203
commit 2ad8dadf44
4 changed files with 28 additions and 0 deletions
+6
View File
@@ -16922,6 +16922,10 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
(40293, 0, 0, 0, 0, 'Item - Siphon Essence'),
(67760, 0, 0, 0, 0, 'Item - Coliseum 25 Heroic Caster Trinket - Pillar of Flame'),
(67714, 0, 0, 0, 0, 'Item - Coliseum 25 Normal Caster Trinket - Pillar of Flame'),
(69729, -1, 0, -1, -1, 'Item - Onyxia 10 Caster Trinket - Searing Flames'),
(69730, -1, 0, -1, -1, 'Item - Onyxia 25 Caster Trinket - Searing Flames'),
(69733, 0, -1, -1, -1, 'Item - Onyxia 10 Caster Trinket - Cauterizing Heal'),
(69734, 0, -1, -1, -1, 'Item - Onyxia 25 Caster Trinket - Cauterizing Heal'),
(44425, 0.7143, -1, -1, -1, 'Mage - Arcane Barrage'),
(30451, 0.7143, -1, -1, -1, 'Mage - Arcane Blast'),
(1449, 0.2128, -1, -1, -1, 'Mage - Arcane Explosion'),
@@ -19411,6 +19415,8 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 67758, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00011000, 0x00000002, 0, 0, 2), -- Item - Coliseum 25 Heroic Caster Trinket - Pillar of Flame
( 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
( 69739, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Item - Onyxia 25 Caster Trinket
( 69755, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Item - Onyxia 10 Caster Trinket
( 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
( 70664, 0x00, 7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
@@ -0,0 +1,6 @@
DELETE FROM `spell_bonus_data` WHERE `entry` IN (69729,69730,69733,69734);
INSERT INTO `spell_bonus_data` VALUES
(69729,-1,0,-1,-1,'Item - Onyxia 10 Caster Trinket - Searing Flames'),
(69730,-1,0,-1,-1,'Item - Onyxia 25 Caster Trinket - Searing Flames'),
(69733,0,-1,-1,-1,'Item - Onyxia 10 Caster Trinket - Cauterizing Heal'),
(69734,0,-1,-1,-1,'Item - Onyxia 25 Caster Trinket - Cauterizing Heal');
@@ -0,0 +1,4 @@
DELETE FROM `spell_proc_event` WHERE `entry` IN (69739,69755);
INSERT INTO `spell_proc_event` VALUES
(69739,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,45),
(69755,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,45),
+12
View File
@@ -5439,6 +5439,18 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
triggered_spell_id = 63321; // Life Tap
break;
}
// Purified Shard of the Scale - Onyxia 10 Caster Trinket
case 69755:
{
triggered_spell_id = (procFlag & PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_POS) ? 69733 : 69729;
break;
}
// Shiny Shard of the Scale - Onyxia 25 Caster Trinket
case 69739:
{
triggered_spell_id = (procFlag & PROC_FLAG_DONE_SPELL_MAGIC_DMG_CLASS_POS) ? 69734 : 69730;
break;
}
case 71519: // Deathbringer's Will Normal
{
if (GetTypeId() != TYPEID_PLAYER)