From 7163f598dc7987f8f95f541a8717859fbe22cc42 Mon Sep 17 00:00:00 2001 From: megamage Date: Sat, 24 Jan 2009 14:11:17 -0600 Subject: *Add some script targets. By raczman. --HG-- branch : trunk --- sql/updates/965_world_scripts.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/965_world_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/965_world_scripts.sql b/sql/updates/965_world_scripts.sql new file mode 100644 index 00000000000..8f141c9290f --- /dev/null +++ b/sql/updates/965_world_scripts.sql @@ -0,0 +1,17 @@ +INSERT INTO `spell_script_target` VALUES +(33655,0,183350), +(33655,0,183351), +(44374,1,24722), +(31538,1,17895), +(29967,1,16524), +(39887,1,23002), +(31617,1,17899), +(31624,1,17899), +(31625,1,17899), +(34019,1,19422), +(34946,1,20040), +(34946,1,20041), +(21934,1,21934), +(43144,1,23817), +(12613,1,5843), +(9095,1,1200); -- cgit v1.2.3 From 1b0bab7f010ba5d188772685af7102ab9ece7d23 Mon Sep 17 00:00:00 2001 From: Blaymoira Date: Sat, 24 Jan 2009 23:48:58 +0100 Subject: *Prevent summoning Nightbane more than one per instance - by Bagsac *Convert more text to database --HG-- branch : trunk --- sql/updates/966_world_scripts.sql | 24 +++ sql/updates/CMakeLists.txt | 2 + .../hellfire_peninsula/boss_doomlord_kazzak.cpp | 45 ++++- .../scripts/zone/karazhan/instance_karazhan.cpp | 9 +- .../zone/shadowmoon_valley/boss_doomwalker.cpp | 208 +++++++++------------ 5 files changed, 161 insertions(+), 127 deletions(-) create mode 100644 sql/updates/966_world_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/966_world_scripts.sql b/sql/updates/966_world_scripts.sql new file mode 100644 index 00000000000..10a3e09985c --- /dev/null +++ b/sql/updates/966_world_scripts.sql @@ -0,0 +1,24 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000395 AND -1000375; +INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES +(-1000375 ,'I remember well the sting of defeat at the conclusion of the Third War. I have waited far too long for my revenge. Now the shadow of the Legion falls over this world. It is only a matter of time until all of your failed creation... is undone.',11332,1,0,0,'kazzak SAY_INTRO'), +(-1000376,'The Legion will conquer all!',11333,1,0,0,'kazzak SAY_AGGRO1'), +(-1000377,'All mortals will perish!',11334,1,0,0,'kazzak SAY_AGGRO2'), +(-1000378,'All life must be eradicated!',11335,1,0,0,'kazzak SAY_SURPREME1'), +(-1000379,'I\'ll rip the flesh from your bones!',11336,1,0,0,'kazzak SAY_SURPREME2'), +(-1000380,'Kirel Narak!',11337,1,0,0,'kazzak SAY_KILL1'), +(-1000381,'Contemptible wretch!',11338,1,0,0,'kazzak SAY_KILL2'), +(-1000382,'The universe will be remade.',11339,1,0,0,'kazzak SAY_KILL3'), +(-1000383,'The Legion... will never... fall.',11340,1,0,0,'kazzak SAY_DEATH'), +(-1000384,'%s goes into a frenzy!',0,2,0,0,'kazzak EMOTE_FRENZY'), +(-1000385,'Invaders, you dangle upon the precipice of oblivion! The Burning Legion comes and with it comes your end.',0,1,0,0,'kazzak SAY_RAND1'), +(-1000386,'Impudent whelps, you only delay the inevitable. Where one has fallen, ten shall rise. Such is the will of Kazzak...',0,1,0,0,'kazzak SAY_RAND2'), + +(-1000387,'Do not proceed. You will be eliminated!',11344,1,0,0,'doomwalker SAY_AGGRO'), +(-1000388,'Tectonic disruption commencing.',11345,1,0,0,'doomwalker SAY_EARTHQUAKE_1'), +(-1000389,'Magnitude set. Release.',11346,1,0,0,'doomwalker SAY_EARTHQUAKE_2'), +(-1000390,'Trajectory locked.',11347,1,0,0,'doomwalker SAY_OVERRUN_1'), +(-1000391,'Engage maximum speed.',11348,1,0,0,'doomwalker SAY_OVERRUN_2'), +(-1000392,'Threat level zero.',11349,1,0,0,'doomwalker SAY_SLAY_1'), +(-1000393,'Directive accomplished.',11350,1,0,0,'doomwalker SAY_SLAY_2'), +(-1000394,'Target exterminated.',11351,1,0,0,'doomwalker SAY_SLAY_3'), +(-1000395,'System failure in five, f-o-u-r...',11352,1,0,0,'doomwalker SAY_DEATH'); \ No newline at end of file diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index afe3b1bff5d..657428c35f8 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -158,4 +158,6 @@ INSTALL(FILES 956_world_scripts.sql 957_world_scripts.sql 963_world_scripts.sql +965_world_scripts.sql +966_world_scripts.sql DESTINATION share/trinity/sql/updates) diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp index c73fbd22225..1264a72f0cb 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp @@ -23,6 +23,19 @@ EndScriptData */ #include "precompiled.h" +#define SAY_INTRO -1000375 +#define SAY_AGGRO1 -1000376 +#define SAY_AGGRO2 -1000377 +#define SAY_SURPREME1 -1000378 +#define SAY_SURPREME2 -1000379 +#define SAY_KILL1 -1000380 +#define SAY_KILL2 -1000381 +#define SAY_KILL3 -1000382 +#define SAY_DEATH -1000383 +#define EMOTE_FRENZY -1000384 +#define SAY_RAND1 -1000385 +#define SAY_RAND2 -1000386 + #define SPELL_SHADOWVOLLEY 32963 #define SPELL_CLEAVE 31779 #define SPELL_THUNDERCLAP 36706 @@ -55,13 +68,39 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI Twisted_Reflection_Timer = 33000; // Timer may be incorrect } - void Aggro(Unit *who) {} + void JustRespawned() + { + DoScriptText(SAY_INTRO, m_creature); + } + + void Aggro(Unit *who) + { + switch(rand()%2) + { + case 0: DoScriptText(SAY_AGGRO1, m_creature); break; + case 1: DoScriptText(SAY_AGGRO2, m_creature); break; + } + } void KilledUnit(Unit* victim) { // When Kazzak kills a player (not pets/totems), he regens some health - if(victim->GetTypeId() == TYPEID_PLAYER) + if (victim->GetTypeId() != TYPEID_PLAYER) + return; + DoCast(m_creature,SPELL_CAPTURESOUL); + + switch(rand()%3) + { + case 0: DoScriptText(SAY_KILL1, m_creature); break; + case 1: DoScriptText(SAY_KILL2, m_creature); break; + case 2: DoScriptText(SAY_KILL3, m_creature); break; + } + } + + void JustDied(Unit *victim) + { + DoScriptText(SAY_DEATH, m_creature); } void UpdateAI(const uint32 diff) @@ -112,6 +151,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI //Enrage_Timer if (Enrage_Timer < diff) { + DoScriptText(EMOTE_FRENZY, m_creature); DoCast(m_creature,SPELL_ENRAGE); Enrage_Timer = 30000; }else Enrage_Timer -= diff; @@ -126,6 +166,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI } }; + CreatureAI* GetAI_boss_doomlordkazzak(Creature *_Creature) { return new boss_doomlordkazzakAI (_Creature); diff --git a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp index 1d2760be73c..5b5dd3dabd9 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp @@ -61,9 +61,10 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance uint64 GamesmansExitDoor; // Door after Chess uint64 NetherspaceDoor; // Door at Malchezaar uint64 MastersTerraceDoor[2]; - uint64 ImageGUID; + bool NightbaneSummoned; + void Initialize() { for (uint8 i = 0; i < ENCOUNTERS; ++i) @@ -87,8 +88,9 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance NetherspaceDoor = 0; MastersTerraceDoor[0]= 0; MastersTerraceDoor[1]= 0; - ImageGUID = 0; + + NightbaneSummoned = false; } bool IsEncounterInProgress() const @@ -131,6 +133,9 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance case 17229: KilrekGUID = creature->GetGUID(); break; case 15688: TerestianGUID = creature->GetGUID(); break; case 15687: MoroesGUID = creature->GetGUID(); break; + case 17225: if(NightbaneSummoned)creature->RemoveFromWorld(); + else NightbaneSummoned = true; + break; } } diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp index 949d447dcaa..eade0b96455 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp @@ -23,53 +23,31 @@ EndScriptData */ #include "precompiled.h" -//-------------------------------------- -//Spells -#define SPELL_SUNDER_ARMOR 33661 +#define SAY_AGGRO -1000387 +#define SAY_EARTHQUAKE_1 -1000388 +#define SAY_EARTHQUAKE_2 -1000389 +#define SAY_OVERRUN_1 -1000390 +#define SAY_OVERRUN_2 -1000391 +#define SAY_SLAY_1 -1000392 +#define SAY_SLAY_2 -1000393 +#define SAY_SLAY_3 -1000394 +#define SAY_DEATH -1000395 +#define SPELL_EARTHQUAKE 32686 +#define SPELL_SUNDER_ARMOR 33661 #define SPELL_CHAIN_LIGHTNING 33665 - #define SPELL_OVERRUN 32636 -#define SAY_OVERRUN_1 "Trajectory locked." -#define SOUND_OVERRUN_1 11347 -#define SAY_OVERRUN_2 "Engage maximum speed." -#define SOUND_OVERRUN_2 11348 - #define SPELL_ENRAGE 33653 - #define SPELL_MARK_DEATH 37128 -#define SPELL_EARTHQUAKE 32686 -#define SAY_EARTHQUAKE_1 "Tectonic disruption commencing." -#define SOUND_EARTHQUAKE_1 11345 -#define SAY_EARTHQUAKE_2 "Magnitude set. Release." -#define SOUND_EARTHQUAKE_2 11346 -//--------------------------------------- -//Aggro -#define SAY_AGGRO "Do not proceed. You will be eliminated!" -#define SOUND_AGGRO 11344 -//--------------------------------------- -//Slay -#define SAY_SLAY_1 "Threat level zero." -#define SOUND_SLAY_1 11349 -#define SAY_SLAY_2 "Directive accomplished." -#define SOUND_SLAY_2 11350 -#define SAY_SLAY_3 "Target exterminated." -#define SOUND_SLAY_3 11351 -//--------------------------------------- -//Death -#define SAY_DEATH "System failure in five... four..." -#define SOUND_DEATH 11352 - -struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI +struct MANGOS_DLL_DECL boss_doomwalkerAI : public ScriptedAI { boss_doomwalkerAI(Creature *c) : ScriptedAI(c) {Reset();} - uint32 Chain_Timer; - uint32 Enrage_Timer; + uint32 Enrage_Timer; uint32 Overrun_Timer; - uint32 Quake_Timer; + uint32 Quake_Timer; uint32 Armor_Timer; bool InEnrage; @@ -82,7 +60,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI Quake_Timer = 25000 + rand()%10000; Overrun_Timer = 30000 + rand()%15000; - InEnrage = false; + InEnrage = false; } void KilledUnit(Unit* Victim) @@ -92,114 +70,98 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI switch(rand()%3) { - case 0: - DoYell(SAY_SLAY_1, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_SLAY_1); - break; - case 1: - DoYell(SAY_SLAY_2, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_SLAY_2); - break; - case 2: - DoYell(SAY_SLAY_3, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_SLAY_3); - break; + case 0: DoScriptText(SAY_SLAY_1, m_creature); break; + case 1: DoScriptText(SAY_SLAY_2, m_creature); break; + case 2: DoScriptText(SAY_SLAY_3, m_creature); break; } + + DoCast(m_creature->getVictim(), SPELL_MARK_DEATH); } void JustDied(Unit* Killer) { - DoYell(SAY_DEATH, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_DEATH); + DoScriptText(SAY_DEATH, m_creature); } void Aggro(Unit *who) { - DoYell(SAY_AGGRO, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_AGGRO); + DoScriptText(SAY_AGGRO, m_creature); } void UpdateAI(const uint32 diff) { - if (!m_creature->SelectHostilTarget() || !m_creature->getVictim()) return; - //if (m_creature->IsWithinDistInMap(m_creature->getVictim(), ATTACK_DISTANCE)) + //Spell Enrage, when hp <= 20% gain enrage + if (((m_creature->GetHealth()*100)/ m_creature->GetMaxHealth()) <= 20) { - //Spell Enrage - if (((m_creature->GetHealth()*100)/ m_creature->GetMaxHealth()) <= 20)//when hp <= 20% gain enrage - { - if(Enrage_Timer < diff) - { - DoCast(m_creature,SPELL_ENRAGE); - Enrage_Timer = 6000; - InEnrage = true; - }else Enrage_Timer -= diff; - } - - //Spell Overrun - if (Overrun_Timer < diff) - { - switch(rand()%2) - { - case 0: - DoYell(SAY_OVERRUN_1, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_OVERRUN_1); - break; - case 1: - DoYell(SAY_OVERRUN_2, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_OVERRUN_2); - break; - } - DoCast(m_creature->getVictim(),SPELL_OVERRUN); - Overrun_Timer = 25000 + rand()%15000; - - }else Overrun_Timer -= diff; - - //Spell Earthquake - if (Quake_Timer < diff) + if(Enrage_Timer < diff) { - if (rand()%2) - return; - - switch(rand()%2) - { - case 0: - DoYell(SAY_EARTHQUAKE_1, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_EARTHQUAKE_1); - break; - case 1: - DoYell(SAY_EARTHQUAKE_2, LANG_UNIVERSAL, NULL); - DoPlaySoundToSet(m_creature, SOUND_EARTHQUAKE_2); - break; - } - if(InEnrage) - { - m_creature->RemoveAura(SPELL_ENRAGE, 0);//remove enrage before casting earthquake because enrage + earthquake = 16000dmg over 8sec and all dead - } - DoCast(m_creature,SPELL_EARTHQUAKE); - Quake_Timer = 30000 + rand()%25000; - }else Quake_Timer -= diff; - - //Spell Chain Lightning - if (Chain_Timer < diff) + DoCast(m_creature,SPELL_ENRAGE); + Enrage_Timer = 6000; + InEnrage = true; + }else Enrage_Timer -= diff; + } + + //Spell Overrun + if (Overrun_Timer < diff) + { + switch(rand()%2) { - DoCast(m_creature->getVictim(),SPELL_CHAIN_LIGHTNING); - Chain_Timer = 15000 + rand()%25000; - }else Chain_Timer -= diff; + case 0: DoScriptText(SAY_OVERRUN_1, m_creature); break; + case 1: DoScriptText(SAY_OVERRUN_2, m_creature); break; + } + + DoCast(m_creature->getVictim(),SPELL_OVERRUN); + Overrun_Timer = 25000 + rand()%15000; + }else Overrun_Timer -= diff; + + //Spell Earthquake + if (Quake_Timer < diff) + { + if (rand()%2) + return; - //Spell Sunder Armor - if (Armor_Timer < diff) + switch(rand()%2) { - DoCast(m_creature->getVictim(),SPELL_SUNDER_ARMOR); - Armor_Timer = 15000 + rand()%15000; - }else Armor_Timer -= diff; + case 0: DoScriptText(SAY_EARTHQUAKE_1, m_creature); break; + case 1: DoScriptText(SAY_EARTHQUAKE_2, m_creature); break; + } - DoMeleeAttackIfReady(); - } + //remove enrage before casting earthquake because enrage + earthquake = 16000dmg over 8sec and all dead + if (InEnrage) + m_creature->RemoveAura(SPELL_ENRAGE, 0); + + DoCast(m_creature,SPELL_EARTHQUAKE); + Quake_Timer = 30000 + rand()%25000; + }else Quake_Timer -= diff; + + //Spell Chain Lightning + if (Chain_Timer < diff) + { + Unit* target = NULL; + target = SelectUnit(SELECT_TARGET_RANDOM,1); + + if (!target) + target = m_creature->getVictim(); + + if (target) + DoCast(target,SPELL_CHAIN_LIGHTNING); + + Chain_Timer = 10000 + rand()%25000; + }else Chain_Timer -= diff; + + //Spell Sunder Armor + if (Armor_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_SUNDER_ARMOR); + Armor_Timer = 10000 + rand()%15000; + }else Armor_Timer -= diff; + + DoMeleeAttackIfReady(); } -}; +}; CreatureAI* GetAI_boss_doomwalker(Creature *_Creature) { @@ -210,7 +172,7 @@ void AddSC_boss_doomwalker() { Script *newscript; newscript = new Script; - newscript->Name="boss_doomwalker"; + newscript->Name = "boss_doomwalker"; newscript->GetAI = &GetAI_boss_doomwalker; newscript->RegisterSelf(); } -- cgit v1.2.3 From f57ed8519cd76435146201404d4ab0e868136183 Mon Sep 17 00:00:00 2001 From: Blaymoira Date: Sun, 25 Jan 2009 11:59:50 +0100 Subject: *Cleanup in Blade's Edge Mountain --HG-- branch : trunk --- sql/updates/970_world_scripts.sql | 9 ++++++ sql/updates/CMakeLists.txt | 1 + .../blades_edge_mountains.cpp | 35 +++++++++++++--------- 3 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 sql/updates/970_world_scripts.sql (limited to 'sql/updates') diff --git a/sql/updates/970_world_scripts.sql b/sql/updates/970_world_scripts.sql new file mode 100644 index 00000000000..0664e079ba0 --- /dev/null +++ b/sql/updates/970_world_scripts.sql @@ -0,0 +1,9 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000401 AND -1000396; +INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES +(-1000396, 'Muahahahaha! You fool! You've released me from my banishment in the interstices between space and time!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_1'), +(-1000397, 'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_2'), +(-1000398, 0, 0, 'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!', 0, 0, 'mobs_nether_Drake - SAY_NIHIL_3'), +(-1000399, 'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.', 0, 0, 'mobs_nether_drake - SAY_NIHIL_4'), +(-1000400, 'NOOOOooooooo!', 1, 0, 'mobs_nether_drake - SAY_NIHIL_INTERRUPT'), + +(-1000401, 'Good $N, you are under the spell's influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE'); \ No newline at end of file diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 657428c35f8..c92e30e023e 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -160,4 +160,5 @@ INSTALL(FILES 963_world_scripts.sql 965_world_scripts.sql 966_world_scripts.sql +970_world_scripts.sql DESTINATION share/trinity/sql/updates) diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp index fba1ed20c72..116c08d4b0a 100644 --- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp @@ -64,11 +64,11 @@ CreatureAI* GetAI_mobs_bladespire_ogre(Creature *_Creature) ## mobs_nether_drake ######*/ -#define SAY_NIHIL_1 "Muahahahaha! You fool! You've released me from my banishment in the interstices between space and time!" -#define SAY_NIHIL_2 "All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!" -#define SAY_NIHIL_3 "Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!" -#define SAY_NIHIL_4 "No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again." -#define SAY_NIHIL_INTERRUPT "NOOOOooooooo!" +#define SAY_NIHIL_1 -1000396 +#define SAY_NIHIL_2 -1000397 +#define SAY_NIHIL_3 -1000398 +#define SAY_NIHIL_4 -1000399 +#define SAY_NIHIL_INTERRUPT -1000400 #define ENTRY_WHELP 20021 #define ENTRY_PROTO 21821 @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI case ENTRY_NIHIL: if( NihilSpeech_Phase ) { - DoYell(SAY_NIHIL_INTERRUPT,LANG_UNIVERSAL,NULL); + DoScriptText(SAY_NIHIL_INTERRUPT, m_creature); IsNihil = false; switch(rand()%3) { @@ -196,19 +196,19 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI switch( NihilSpeech_Phase ) { case 1: - DoSay(SAY_NIHIL_1,LANG_UNIVERSAL,NULL); + DoScriptText(SAY_NIHIL_1, m_creature); ++NihilSpeech_Phase; break; case 2: - DoSay(SAY_NIHIL_2,LANG_UNIVERSAL,NULL); + DoScriptText(SAY_NIHIL_2, m_creature); ++NihilSpeech_Phase; break; case 3: - DoSay(SAY_NIHIL_3,LANG_UNIVERSAL,NULL); + DoScriptText(SAY_NIHIL_3, m_creature); ++NihilSpeech_Phase; break; case 4: - DoSay(SAY_NIHIL_4,LANG_UNIVERSAL,NULL); + DoScriptText(SAY_NIHIL_4, m_creature); ++NihilSpeech_Phase; break; case 5: @@ -261,6 +261,8 @@ CreatureAI* GetAI_mobs_nether_drake(Creature *_Creature) ## npc_daranelle ######*/ +#define SAY_DARANELLE -1000401 + struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI { npc_daranelleAI(Creature *c) : ScriptedAI(c) {Reset();} @@ -279,7 +281,7 @@ struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI { if(who->HasAura(36904,0)) { - DoSay("Good $N, you are under the spell's influence. I must analyze it quickly, then we can talk.",LANG_COMMON,who); + DoScriptText(SAY_DARANELLE, m_creature, who); //TODO: Move the below to updateAI and run if this statement == true ((Player*)who)->KilledMonster(21511, m_creature->GetGUID()); ((Player*)who)->RemoveAurasDueToSpell(36904); @@ -299,10 +301,12 @@ CreatureAI* GetAI_npc_daranelle(Creature *_Creature) ## npc_overseer_nuaar ######*/ +#define GOSSIP_HON "Overseer, I am here to negotiate on behalf of the Cenarion Expedition." + bool GossipHello_npc_overseer_nuaar(Player *player, Creature *_Creature) { if (player->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM( 0, "Overseer, I am here to negotiate on behalf of the Cenarion Expedition.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(10532, _Creature->GetGUID()); @@ -323,10 +327,13 @@ bool GossipSelect_npc_overseer_nuaar(Player *player, Creature *_Creature, uint32 ## npc_saikkal_the_elder ######*/ +#define GOSSIP_HSTE "Yes... yes, it's me." +#define GOSSIP_SSTE "Yes elder. Tell me more of the book." + bool GossipHello_npc_saikkal_the_elder(Player *player, Creature *_Creature) { if (player->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM( 0, "Yes... yes, it's me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HSTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(10794, _Creature->GetGUID()); @@ -338,7 +345,7 @@ bool GossipSelect_npc_saikkal_the_elder(Player *player, Creature *_Creature, uin switch (action) { case GOSSIP_ACTION_INFO_DEF+1: - player->ADD_GOSSIP_ITEM( 0, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_SSTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(10795, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: -- cgit v1.2.3 From 2ecd61f028b3bdbce1009eef0a4c47bc5fd4e6d2 Mon Sep 17 00:00:00 2001 From: Blaymoira Date: Sun, 25 Jan 2009 16:36:24 +0100 Subject: *Fix a typo --HG-- branch : trunk --- sql/updates/970_world_scripts.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/updates') diff --git a/sql/updates/970_world_scripts.sql b/sql/updates/970_world_scripts.sql index 0664e079ba0..9e66e60f65d 100644 --- a/sql/updates/970_world_scripts.sql +++ b/sql/updates/970_world_scripts.sql @@ -1,9 +1,9 @@ DELETE FROM script_texts WHERE entry BETWEEN -1000401 AND -1000396; INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES -(-1000396, 'Muahahahaha! You fool! You've released me from my banishment in the interstices between space and time!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_1'), +(-1000396, 'Muahahahaha! You fool! You\'ve released me from my banishment in the interstices between space and time!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_1'), (-1000397, 'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_2'), -(-1000398, 0, 0, 'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!', 0, 0, 'mobs_nether_Drake - SAY_NIHIL_3'), +(-1000398, 'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!', 0, 0, 'mobs_nether_Drake - SAY_NIHIL_3'), (-1000399, 'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.', 0, 0, 'mobs_nether_drake - SAY_NIHIL_4'), (-1000400, 'NOOOOooooooo!', 1, 0, 'mobs_nether_drake - SAY_NIHIL_INTERRUPT'), -(-1000401, 'Good $N, you are under the spell's influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE'); \ No newline at end of file +(-1000401, 'Good $N, you are under the spell\'s influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE'); -- cgit v1.2.3