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

Naxxramas: Backout Faerlina's adds code, they work with ACID

Browse Source 
Modify Faerlina's script to work without add's one

--HG--
branch : trunk
This commit is contained in:
tartalo
2009-10-27 11:52:32 +01:00
parent 7c79ab04aa
commit 144fd2436f
3 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/FULL/world_scripts_full.sql
View File

@@ -779,7 +779,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_maghar_captive' WHERE `entry`=1
UPDATE `instance_template` SET `script`='instance_naxxramas' WHERE `map`=533;
UPDATE `creature_template` SET `ScriptName`='boss_anubrekhan' WHERE `entry`=15956;
UPDATE `creature_template` SET `ScriptName`='boss_faerlina' WHERE `entry`=15953;
UPDATE `creature_template` SET `ScriptName`='mob_worshipper' WHERE `entry`=16506;
UPDATE `creature_template` SET `ScriptName`='boss_maexxna' WHERE `entry`=15952;
UPDATE `creature_template` SET `ScriptName`='mob_webwrap' WHERE `entry`=16486;
UPDATE `creature_template` SET `ScriptName`='boss_noth' WHERE `entry`=15954;

1
sql/updates/6079_world_scripts.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16506;

38
src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp
View File

@@ -54,7 +54,7 @@ enum Events
enum Creatures
{
NPC_FAERLINA = 15953
NPC_WORSHIPPER = 16506
};
struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI
@@ -126,10 +126,10 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI
DoMeleeAttackIfReady();
}
void DispellEnrage()
void SpellHit(Unit* caster, const SpellEntry *spell)
{
events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000));
m_creature->RemoveAurasDueToSpell(HEROIC(SPELL_FRENZY,H_SPELL_FRENZY));
if (caster->GetEntry() == NPC_WORSHIPPER && spell->Id == HEROIC(SPELL_FRENZY,H_SPELL_FRENZY))
events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000));
}
};
@@ -138,31 +138,6 @@ CreatureAI* GetAI_boss_faerlina(Creature* pCreature)
return new boss_faerlinaAI (pCreature);
}
struct TRINITY_DLL_DECL mob_worshipperAI : public ScriptedAI
{
mob_worshipperAI(Creature *c) : ScriptedAI(c)
{
pInstance = c->GetInstanceData();
}
ScriptedInstance *pInstance;
void JustDied(Unit *pKiller)
{
if (pInstance)
if (Creature* pFaerlina = pInstance->instance->GetCreature(NPC_FAERLINA))
{
DoCast(pFaerlina,HEROIC(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE));
CAST_AI(boss_faerlinaAI,pFaerlina->AI())->DispellEnrage();
}
}
};
CreatureAI* GetAI_mob_worshipper(Creature* pCreature)
{
return new mob_worshipperAI (pCreature);
}
void AddSC_boss_faerlina()
{
Script *newscript;
@@ -170,11 +145,6 @@ void AddSC_boss_faerlina()
newscript->Name = "boss_faerlina";
newscript->GetAI = &GetAI_boss_faerlina;
newscript->RegisterSelf();
newscript = new Script;
newscript->Name = "mob_worshipper";
newscript->GetAI = &GetAI_mob_worshipper;
newscript->RegisterSelf();
}