Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix haunt

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Blaymoira
2009-03-14 22:50:37 +01:00
parent 05c7639e7b
commit 596488d05e
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/1905_world.sql Normal file
View File

@@ -0,0 +1,4 @@
REPLACE INTO `spell_proc_event` VALUES (48181, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);
REPLACE INTO `spell_proc_event` VALUES (59161, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);
REPLACE INTO `spell_proc_event` VALUES (59163, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);
REPLACE INTO `spell_proc_event` VALUES (59164, 0x00, 5, 0x00000000, 262144, 0x00000000, 0x00000000, 0x0002000, 0.000000, 0.000000, 0);

1
sql/updates/CMakeLists.txt
View File

@@ -84,4 +84,5 @@ INSTALL(FILES
1884_world.sql
1886_world.sql
1895_world.sql
1905_world.sql
DESTINATION share/trinity/sql/updates)

4
src/game/SpellEffects.cpp
View File

@@ -443,8 +443,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
// Haunt
else if (m_spellInfo->SpellFamilyFlags[1] & 0x40000)
{
// Save damage for future healing
// TODO: Implement spell proc on aura expire
m_currentBasePoints[1] = int32(damage * m_currentBasePoints[1] / 100);
}
@@ -3704,7 +3702,7 @@ void Spell::EffectAddFarsight(uint32 i)
dynObj->GetMap()->Add(dynObj); //grid will also be loaded
// Need to update visibility of object for client to accept farsight guid
((Player*)m_caster)->CreateSeer(dynObj);
((Player*)m_caster)->SetSeer(dynObj);
//((Player*)m_caster)->UpdateVisibilityOf(dynObj);
}

10
src/game/Unit.cpp
View File

@@ -5594,6 +5594,16 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
basepoints0 = damage * triggerAmount / 100;
break;
}
// Haunt
if (dummySpell->SpellFamilyFlags[1] & 0x40000)
{
if(!pVictim || !pVictim->isAlive())
return false;
basepoints0 = dummySpell->EffectBasePoints[1];
triggered_spell_id = 48210;
return true;
}
switch(dummySpell->Id)
{
// Nightfall