josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed pet talents: Guard Dog and Silverback

Browse Source 
Removed pre-3.3.0 code for Improved Cower

Closes issue #3198.

--HG--
branch : trunk
This commit is contained in:
Shauren
2010-08-04 17:49:23 +02:00
parent 6353e7dd8c
commit 362ae2d4c6
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/base/world_database.sql
+4
View File
@@ -7307,6 +7307,10 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 27044, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Aspect of the Hawk ( 27044, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Aspect of the Hawk
( 61846, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Aspect of the Dragonhawk ( 61846, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Aspect of the Dragonhawk
( 61847, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Aspect of the Dragonhawk ( 61847, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0, 0, 0), -- Aspect of the Dragonhawk
( 53178, 0x00, 9, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0, 100, 0), -- Guard Dog (Rank 1)
( 53179, 0x00, 9, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0, 100, 0), -- Guard Dog (Rank 2)
( 62764, 0x00, 9, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0, 100, 0), -- Silverback (Rank 1)
( 62765, 0x00, 9, 0x00000000, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0, 100, 0), -- Silverback (Rank 2)
( 49223, 0x00, 15, 0x00000011, 0x08020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Dirge ( 49223, 0x00, 15, 0x00000011, 0x08020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Dirge
( 49599, 0x00, 15, 0x00000011, 0x08020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Dirge ( 49599, 0x00, 15, 0x00000011, 0x08020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Dirge
( 49188, 0x00, 15, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Rime ( 49188, 0x00, 15, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0), -- Rime
sql/updates/9166_world_spell_proc_event.sql
+6
View File
@@ -0,0 +1,6 @@
DELETE FROM `spell_proc_event` WHERE `entry` IN (53178,53179,62764,62765);
INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
(53178,0x00,9,0x00000000,0x10000000,0x00000000,0x00000000,0x00000000,0,100,0), -- GuardDog(Rank1)
(53179,0x00,9,0x00000000,0x10000000,0x00000000,0x00000000,0x00000000,0,100,0), -- GuardDog(Rank2)
(62764,0x00,9,0x00000000,0x10000000,0x00000000,0x00000000,0x00000000,0,100,0), -- Silverback(Rank1)
(62765,0x00,9,0x00000000,0x10000000,0x00000000,0x00000000,0x00000000,0,100,0); -- Silverback(Rank2)
src/server/game/Entities/Unit/Unit.cpp
+14 -14
View File
@@ -7717,22 +7717,22 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
} }
break; break;
} }
case SPELLFAMILY_PET: case SPELLFAMILY_PET:
{ {
// improved cower switch (dummySpell->SpellIconID)
if (dummySpell->SpellIconID == 958 && procSpell->SpellIconID == 958)
{ {
triggered_spell_id = dummySpell->Id == 53180 ? 54200 : 54201; // Guard Dog
target = this; case 201:
break; triggered_spell_id = 54445;
} target = this;
// guard dog float addThreat = SpellMgr::CalculateSpellEffectAmount(procSpell, 0, this) * triggerAmount / 100.f;
if (dummySpell->SpellIconID == 201 && procSpell->SpellIconID == 201) pVictim->AddThreat(this, addThreat);
{ break;
triggered_spell_id = 54445; // Silverback
target = this; case 1582:
pVictim->AddThreat(this,procSpell->EffectBasePoints[0]*triggerAmount/100.0f); triggered_spell_id = dummySpell->Id == 62765 ? 62801 : 62800;
break; target = this;
break;
} }
break; break;
} }