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

Glyph of Blocking proc moved to DB.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Astellar
2010-01-05 15:52:44 +03:00
parent 53a7a7bd48
commit a886552c85
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/6901_world_spell_proc_event.sql
+2
View File
@@ -0,0 +1,2 @@
DELETE FROM spell_proc_event WHERE entry = 58375;
INSERT INTO spell_proc_event VALUES(58375, 0, 4, 0, 0x200, 0, 0x10, 0, 0, 0, 0); -- Glyph of Blocking
sql/world.sql
+1
View File
@@ -6681,6 +6681,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
( 57989, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0, 0, 0), -- uncommented ( 57989, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0, 0, 0), -- uncommented
( 65661, 0x00, 15, 0x00400010, 0x20020004, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0), -- uncommented ( 65661, 0x00, 15, 0x00400010, 0x20020004, 0x00000000, 0x00000010, 0x00000000, 0, 100, 0), -- uncommented
( 53601, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0, 0, 6), -- Sacred Shield (Rank 1) ( 53601, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000A02A8, 0x00000000, 0, 0, 6), -- Sacred Shield (Rank 1)
( 58375, 0x00, 4, 0x00000000, 0x00000200, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0), -- Glyph of Blocking
( 58387, 0x00, 4, 0x00004000, 0x00000040, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0), -- Glyph of Sunder Armor ( 58387, 0x00, 4, 0x00004000, 0x00000040, 0x00000000, 0x00000010, 0x00000000, 0, 0, 0), -- Glyph of Sunder Armor
( 54925, 0x02, 10, 0x00000000, 0x00000208, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Glyph of Seal of Command ( 54925, 0x02, 10, 0x00000000, 0x00000208, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Glyph of Seal of Command
/*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */; /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */;
src/game/SpellEffects.cpp
-8
View File
@@ -431,7 +431,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
} }
break; break;
} }
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{ {
// Bloodthirst // Bloodthirst
@@ -439,14 +438,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100); damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100);
// Shield Slam // Shield Slam
else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209)
{
damage += int32(m_caster->GetShieldBlockValue()); damage += int32(m_caster->GetShieldBlockValue());
// Glyph of Shield Slam
if (m_caster->HasAura(58375))
m_caster->CastSpell(m_caster, 58374, true);
}
// Victory Rush // Victory Rush
else if(m_spellInfo->SpellFamilyFlags[1] & 0x100) else if(m_spellInfo->SpellFamilyFlags[1] & 0x100)
{ {
src/game/Unit.cpp
+6 -6
View File
@@ -5059,12 +5059,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
triggered_spell_id = 26654; triggered_spell_id = 26654;
break; break;
} }
// Glyph of Blocking
case 58375:
{
triggered_spell_id = 58374;
break;
}
// Unstable Power // Unstable Power
case 24658: case 24658:
{ {
@@ -5665,6 +5659,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
basepoints0 = GetShieldBlockValue() * triggerAmount / 100; basepoints0 = GetShieldBlockValue() * triggerAmount / 100;
break; break;
} }
// Glyph of Blocking
if (dummySpell->Id == 58375)
{
triggered_spell_id = 58374;
break;
}
// Glyph of Sunder Armor // Glyph of Sunder Armor
if (dummySpell->Id == 58387) if (dummySpell->Id == 58387)
{ {