diff options
| -rw-r--r-- | src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp | 49 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp | 66 |
2 files changed, 37 insertions, 78 deletions
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 22e1b504446..76823289ba5 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -27,20 +27,14 @@ EndScriptData */ #include "def_utgarde_keep.h" //Yells Ingvar -#define YELL_AGGRO_1 "I'll paint my face with your blood!" -#define SOUND_AGGRO_1 13207 -#define YELL_AGGRO_2 "I return! A second chance to carve out your skull!" -#define SOUND_AGGRO_2 13209 +#define YELL_AGGRO_1 -1574015 +#define YELL_AGGRO_2 -1574022 -#define YELL_DEAD_1 "My life for the... death god!" -#define SOUND_DEAD_1 13213 -#define YELL_DEAD_2 "No! I can do... better! I can..." -#define SOUND_DEAD_2 13211 +#define YELL_DEAD_1 -1574017 +#define YELL_DEAD_2 -1574024 -#define YELL_KILL_1 "Mjul orm agn gjor!" -#define SOUND_KILL_1 13212 -#define YELL_KILL_2 "I am a warriorborn!" -#define SOUND_KILL_2 13214 +#define YELL_KILL_1 -1574023 +#define YELL_KILL_2 -1574016 //Ingvar Spells human form #define MOB_INGVAR_HUMAN 23954 @@ -92,7 +86,6 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI uint32 SpawnResTimer; uint32 wait_Timer; - void Reset() { if(undead) // Visual Hack @@ -135,8 +128,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI event_inProgress = true; undead = true; - DoYell(YELL_DEAD_1,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_DEAD_1); + DoScriptText(YELL_DEAD_1,m_creature); } if(event_inProgress) @@ -153,14 +145,12 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); m_creature->AI()->AttackStart(m_creature->getVictim()); - DoYell(YELL_AGGRO_2,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_AGGRO_2); + DoScriptText(YELL_AGGRO_2,m_creature); } void Aggro(Unit *who) { - DoYell(YELL_AGGRO_1,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_AGGRO_1); + DoScriptText(YELL_AGGRO_1,m_creature); if(pInstance) pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); @@ -168,8 +158,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI void JustDied(Unit* killer) { - DoYell(YELL_DEAD_2,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_DEAD_2); + DoScriptText(YELL_DEAD_2,m_creature); if(pInstance) pInstance->SetData(DATA_INGVAR_EVENT, DONE); @@ -177,16 +166,8 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI void KilledUnit(Unit *victim) { - if(undead) - { - DoYell(YELL_KILL_1,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_KILL_1); - } - else - { - DoYell(YELL_KILL_2,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_KILL_2); - } + if(undead) { DoScriptText(YELL_KILL_1,m_creature); } + else { DoScriptText(YELL_KILL_2,m_creature); } } void UpdateAI(const uint32 diff) @@ -292,8 +273,7 @@ CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature *_Creature) return new boss_ingvar_the_plundererAI (_Creature); } -#define YELL_RESSURECT "Ingvar! Your pathetic failure will serve as a warning to all... you are damned! Arise and carry out the master's will!" -#define SOUND_RESSURECT 13754 +#define YELL_RESSURECT -1574025 //Spells for Annhylde #define SPELL_SCOURG_RESURRECTION_HEAL 42704 //Heal Max + DummyAura @@ -329,8 +309,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI { m_creature->GetMotionMaster()->MovePoint(1,x,y,z+15); - DoYell(YELL_RESSURECT,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_RESSURECT); + DoScriptText(YELL_RESSURECT,m_creature); } } diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index 78bc29a770d..667baa3a781 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -26,29 +26,19 @@ EndScriptData */ #include "precompiled.h" #include "def_utgarde_keep.h" -#define YELL_SKARVALD_AGGRO "Dalronn! See if you can muster the nerve to join my attack!" -#define SOUND_SKARVALD_AGGRO 13229 -#define YELL_DALRONN_AGGRO "By all means, don't assess the situation, you halfwit! Just jump into the fray!" -#define SOUND_DALRONN_AGGRO 13199 - -#define YELL_SKARVALD_KILL "Jarggn olkt!" -#define SOUND_SKARVALD_KILL 13232 -#define YELL_DALRONN_KILL "You may serve me yet." -#define SOUND_DALRONN_KILL 13202 - -#define YELL_DALRONN_DAL_DIEDFIRST "See... you... soon." -#define SOUND_DALRONN_DAL_DIEDFIRST 13200 -#define YELL_SKARVALD_DAL_DIEDFIRST "Pagh! What sort of necromancer lets death stop him? I knew you were worthless!" -#define SOUND_SKARVALD_DAL_DIEDFIRST 13233 -#define YELL_SKARVALD_DAL_DIED "A warrior's death." -#define SOUND_SKARVALD_DAL_DIED 13231 - -#define YELL_SKARVALD_SKA_DIEDFIRST "Not... over... yet." -#define SOUND_SKARVALD_SKA_DIEDFIRST 13230 -#define YELL_DALRONN_SKA_DIEDFIRST "Skarvald, you incompetent slug! Return and make yourself useful!" -#define SOUND_DALRONN_SKA_DIEDFIRST 13203 -#define YELL_DALRONN_SKA_DIED "There's no... greater... glory." -#define SOUND_DALRONN_SKA_DIED 13201 +#define YELL_SKARVALD_AGGRO -1574010 +#define YELL_DALRONN_AGGRO -1574005 + +#define YELL_SKARVALD_KILL -1574011 +#define YELL_DALRONN_KILL -1574006 + +#define YELL_DALRONN_DAL_DIEDFIRST -1574007 +#define YELL_SKARVALD_DAL_DIEDFIRST -1574014 +#define YELL_SKARVALD_DAL_DIED -1574013 + +#define YELL_SKARVALD_SKA_DIEDFIRST -1574012 +#define YELL_DALRONN_SKA_DIEDFIRST -1574009 +#define YELL_DALRONN_SKA_DIED -1574008 //Spells of Skarvald and his Ghost #define MOB_SKARVALD_THE_CONSTRUCTOR 24200 @@ -106,8 +96,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI { if(!ghost) { - DoYell(YELL_SKARVALD_AGGRO,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_SKARVALD_AGGRO); + DoScriptText(YELL_SKARVALD_AGGRO,m_creature); Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN)); if(dalronn && dalronn->isAlive() && !dalronn->getVictim()) @@ -127,16 +116,14 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI { if(dalronn->isDead()) { - DoYell(YELL_SKARVALD_DAL_DIED,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_SKARVALD_DAL_DIED); + DoScriptText(YELL_SKARVALD_DAL_DIED,m_creature); if(pInstance) pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoYell(YELL_SKARVALD_SKA_DIEDFIRST,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_SKARVALD_SKA_DIEDFIRST); + DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST,m_creature); m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(m_creature,SPELL_SUMMON_SKARVALD_GHOST,true); @@ -151,8 +138,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI { if(!ghost) { - DoYell(YELL_SKARVALD_KILL,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_SKARVALD_KILL); + DoScriptText(YELL_SKARVALD_KILL,m_creature); } } @@ -188,8 +174,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI if(Dalronn_isDead) if(Response_Timer < diff) { - DoYell(YELL_SKARVALD_DAL_DIEDFIRST,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_SKARVALD_DAL_DIEDFIRST); + DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,m_creature); Response_Timer = 0; }else Response_Timer -= diff; @@ -282,16 +267,14 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI if(skarvald) if(skarvald->isDead()) { - DoYell(YELL_DALRONN_SKA_DIED,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_DALRONN_SKA_DIED); + DoScriptText(YELL_DALRONN_SKA_DIED,m_creature); if(pInstance) pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoYell(YELL_DALRONN_DAL_DIEDFIRST,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_DALRONN_DAL_DIEDFIRST); + DoScriptText(YELL_DALRONN_DAL_DIEDFIRST,m_creature); m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(m_creature,SPELL_SUMMON_DALRONN_GHOST,true); @@ -305,8 +288,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI { if(!ghost) { - DoYell(YELL_DALRONN_KILL,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_DALRONN_KILL); + DoScriptText(YELL_DALRONN_KILL,m_creature); } } @@ -326,8 +308,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI if(AggroYell_Timer) if(AggroYell_Timer < diff) { - DoYell(YELL_DALRONN_AGGRO,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_DALRONN_AGGRO); + DoScriptText(YELL_DALRONN_AGGRO,m_creature); AggroYell_Timer = 0; }else AggroYell_Timer -= diff; @@ -351,8 +332,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI if(Skarvald_isDead) if(Response_Timer < diff) { - DoYell(YELL_DALRONN_SKA_DIEDFIRST,LANG_UNIVERSAL,NULL); - DoPlaySoundToSet(m_creature,SOUND_DALRONN_SKA_DIEDFIRST); + DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,m_creature); Response_Timer = 0; }else Response_Timer -= diff; |