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

*Moved spell fix from Murmur's script to core

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Blaymoira
2009-02-08 10:42:58 +01:00
parent 02d6b7c683
commit f305c92272
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/1026_world.sql
+1 -1
View File
@@ -1,4 +1,4 @@
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN ('-33711','-38794','33686'); DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN ('33686', '31705');
INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
('-33711','33686','0','Murmur\'s Shockwave (Normal)'), ('-33711','33686','0','Murmur\'s Shockwave (Normal)'),
('-38794','33686','0','Murmur\'s Shockwave (Heroic)'), ('-38794','33686','0','Murmur\'s Shockwave (Heroic)'),
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
-8
View File
@@ -29,7 +29,6 @@ EndScriptData */
#define SPELL_SONIC_BOOM_EFFECT (HeroicMode?38795:33666) #define SPELL_SONIC_BOOM_EFFECT (HeroicMode?38795:33666)
#define SPELL_RESONANCE 33657 #define SPELL_RESONANCE 33657
#define SPELL_MURMURS_TOUCH (HeroicMode?38794:33711) #define SPELL_MURMURS_TOUCH (HeroicMode?38794:33711)
#define SPELL_MURMURS_TOUCH_VISUAL 33760
#define SPELL_MAGNETIC_PULL 33689 #define SPELL_MAGNETIC_PULL 33689
#define SPELL_SONIC_SHOCK 38797 #define SPELL_SONIC_SHOCK 38797
#define SPELL_THUNDERING_STORM 39365 #define SPELL_THUNDERING_STORM 39365
@@ -40,13 +39,6 @@ struct TRINITY_DLL_DECL boss_murmurAI : public Scripted_NoMovementAI
{ {
HeroicMode = m_creature->GetMap()->IsHeroic(); HeroicMode = m_creature->GetMap()->IsHeroic();
Reset(); Reset();
// need core fix
if(SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_MURMURS_TOUCH))
{
TempSpell->EffectTriggerSpell[0] = SPELL_MURMURS_TOUCH_VISUAL;
TempSpell->MaxAffectedTargets = 1;
}
} }
uint32 SonicBoom_Timer; uint32 SonicBoom_Timer;
src/game/SpellMgr.cpp
+7 -2
View File
@@ -509,7 +509,8 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex)
case 37675: // Chaos Blast case 37675: // Chaos Blast
case 41519: // Mark of Stormrage case 41519: // Mark of Stormrage
case 34877: // Custodian of Time case 34877: // Custodian of Time
case 34700: case 34700: // Allergic Reaction
case 31719: // Suspension
return false; return false;
} }
@@ -2186,7 +2187,7 @@ void SpellMgr::LoadSpellCustomAttr()
case 41635: // Prayer of Mending case 41635: // Prayer of Mending
case 44869: // Spectral Blast case 44869: // Spectral Blast
case 45027: // Revitalize case 45027: // Revitalize
case 45976: // Muru Portal Channel case 45976: // Muru Portal Channel
spellInfo->MaxAffectedTargets = 1; spellInfo->MaxAffectedTargets = 1;
break; break;
case 41376: // Spite case 41376: // Spite
@@ -2218,6 +2219,10 @@ void SpellMgr::LoadSpellCustomAttr()
case 12494: // Frostbite case 12494: // Frostbite
spellInfo->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE; spellInfo->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
break; break;
case 38794: case 33711: //Murmur's Touch
spellInfo->MaxAffectedTargets = 1;
spellInfo->EffectTriggerSpell[0] = 33760;
break;
default: default:
break; break;
} }