* Fix CRLF.

--HG--
branch : trunk

6 files changed, 313 insertions, 313 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 4bc70ed681b..a3df5b9b5dc 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -436,34 +436,34 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (26588,-1800011, 'The Ravenous Worg chomps down on Mr. Floppy',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,4,0,0, '12027'),
    (26588,-1800012, 'Are you ready, Mr. Floppy? Stay close to me and watch out for those wolves!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
    (26588,-1800013, 'Thank you for helping me get back to the camp. Go tell Walter that I''m safe now!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
-   (27316,-1800014, 'Stand back, $N, the beast might lash out and harm you. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800015, 'GODFREY! Hear me, fiend! Hear me, for I am the Light, here to deliver you from evil! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800016, 'Good, I have your attention, then, Godfrey? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800017, 'We can do this in one of two ways, Godfrey. First,I will simply ask you to tell me what the unholy markings etched upon the pages of this tome mean. What say you? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

+   (27316,-1800014, 'Stand back, $N, the beast might lash out and harm you. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800015, 'GODFREY! Hear me, fiend! Hear me, for I am the Light, here to deliver you from evil! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800016, 'Good, I have your attention, then, Godfrey? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800017, 'We can do this in one of two ways, Godfrey. First,I will simply ask you to tell me what the unholy markings etched upon the pages of this tome mean. What say you? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
    (27577,-1800018, 'Tell you nothing, preacher. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
-   (27577,-1800019, 'What can you do to me that Kel''Thuzad has not? That the Lich King will not? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800020, 'The book is your salvation, yes... but nothing will you know. NOTHING I SAY! NOTHING! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800021, 'Then it is option two. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800022, 'I say a prayer for you now,lost soul. May the Light take you gracefully. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800023, 'Let the sermon begin.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800024, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800025, 'IT BURNSSSSS! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800026, 'May the power of Light compel you! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800027, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800028, 'Never felt hurt like this! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800029, 'LIGHT TAKE YOU, BEAST! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800030, 'The power of the Lich King pales in comparison to the glory of the Light! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800031, 'I thought you would see the Light, Godfrey... Now speak quickly,fiend. What does it say? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800032, 'It tells of the coming apocalypse. How this world will burn and be reborn from death. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800033, 'RUBBISH! Godfrey do you take me for a fool? Do not spew your Scourge propaganda at a man of the Light,heathen! Speak now or I will have the peasants craft a holy water bath and dip you into it like a dog with fleas! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800034, 'NOOOO!!! I tell you! I tell you everything! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800035, 'Humans... Beneath the earth of Wintergarde Village you built a mausoleum! Why do you think Naxxramas attacked that spot? Thel''zan hides deep in your own crypt and sends a thousand-thousand corpses at you! Perish you will... ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800036, 'What? There is a mausoleum beneath the old village? What fools we are to not have noticed. We will find and strike down your master now,Godfrey. We will end this nightmare. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800037, 'How? Humans truly are stupid, yes? Thel''zan the Duskbringer! Thel''zan the Lich! He who is born of human flesh and bone,sacrificed all power, protected by the Lich King! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27577,-1800038, 'You cannot stop Thel''zan! He bears the dark gift, bestowed upon him by the Lich King himself! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800039, 'You let us worry about how we kill the bastard, Godfrey. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800040, 'Return to Halford with the information the good mayor was kind enough to submit, $N, I will finish here and squeeze whatever else this wretch might know about Thel''zan. Now, I will show Godfrey the rarely shown "option three." ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-   (27316,-1800041, 'Let''s you and I have a chat about some things, Godfrey.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

+   (27577,-1800019, 'What can you do to me that Kel''Thuzad has not? That the Lich King will not? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800020, 'The book is your salvation, yes... but nothing will you know. NOTHING I SAY! NOTHING! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800021, 'Then it is option two. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800022, 'I say a prayer for you now,lost soul. May the Light take you gracefully. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800023, 'Let the sermon begin.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800024, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800025, 'IT BURNSSSSS! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800026, 'May the power of Light compel you! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800027, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800028, 'Never felt hurt like this! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800029, 'LIGHT TAKE YOU, BEAST! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800030, 'The power of the Lich King pales in comparison to the glory of the Light! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800031, 'I thought you would see the Light, Godfrey... Now speak quickly,fiend. What does it say? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800032, 'It tells of the coming apocalypse. How this world will burn and be reborn from death. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800033, 'RUBBISH! Godfrey do you take me for a fool? Do not spew your Scourge propaganda at a man of the Light,heathen! Speak now or I will have the peasants craft a holy water bath and dip you into it like a dog with fleas! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800034, 'NOOOO!!! I tell you! I tell you everything! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800035, 'Humans... Beneath the earth of Wintergarde Village you built a mausoleum! Why do you think Naxxramas attacked that spot? Thel''zan hides deep in your own crypt and sends a thousand-thousand corpses at you! Perish you will... ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800036, 'What? There is a mausoleum beneath the old village? What fools we are to not have noticed. We will find and strike down your master now,Godfrey. We will end this nightmare. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800037, 'How? Humans truly are stupid, yes? Thel''zan the Duskbringer! Thel''zan the Lich! He who is born of human flesh and bone,sacrificed all power, protected by the Lich King! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27577,-1800038, 'You cannot stop Thel''zan! He bears the dark gift, bestowed upon him by the Lich King himself! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800039, 'You let us worry about how we kill the bastard, Godfrey. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800040, 'Return to Halford with the information the good mayor was kind enough to submit, $N, I will finish here and squeeze whatever else this wretch might know about Thel''zan. Now, I will show Godfrey the rarely shown "option three." ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+   (27316,-1800041, 'Let''s you and I have a chat about some things, Godfrey.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
 
 -- -1 033 000 SHADOWFANG KEEP
    (0,-1033000,'Follow me and I''ll open the courtyard door for you.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,1,'prisoner ashcrombe SAY_FREE_AS'),
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index a35d85256e5..62d43741188 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -2095,32 +2095,32 @@ INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`,`location_y`,`loca
 (26499,56,2296.665,1502.362,128.362,0, 'culling Crusader WP2');
 
 -- Quest 12321 - Inquisitor Hallard in Dragonblight
-DELETE FROM `script_waypoint` WHERE `entry`=27316;

-INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`,`location_y`,`location_z`,`waittime`,`point_comment`) VALUES

-(27316,1,3801.11,-678.964,213.753,5000, ''),

-(27316,2,3801.11,-678.964,213.753,5000, ''),

-(27316,3,3801.11,-678.964,213.753,5000, ''),

-(27316,4,3801.11,-678.964,213.753,5000, ''),

-(27316,5,3801.11,-678.964,213.753,5000, ''),

-(27316,6,3801.11,-678.964,213.753,5000, ''),

-(27316,7,3801.11,-678.964,213.753,5000, ''),

-(27316,8,3801.11,-678.964,213.753,5000, ''),

-(27316,9,3801.11,-678.964,213.753,5000, ''),

-(27316,10,3801.11,-678.964,213.753,5000, ''),

-(27316,11,3801.11,-678.964,213.753,5000, ''),

-(27316,12,3801.11,-678.964,213.753,5000, ''),

-(27316,13,3801.11,-678.964,213.753,5000, ''),

-(27316,14,3801.11,-678.964,213.753,5000, ''),

-(27316,15,3801.11,-678.964,213.753,5000, ''),

-(27316,16,3801.11,-678.964,213.753,5000, ''),

-(27316,17,3801.11,-678.964,213.753,5000, ''),

-(27316,18,3801.11,-678.964,213.753,5000, ''),

-(27316,19,3801.11,-678.964,213.753,5000, ''),

-(27316,20,3801.11,-678.964,213.753,5000, ''),

-(27316,21,3801.11,-678.964,213.753,5000, ''),

-(27316,22,3801.11,-678.964,213.753,5000, ''),

-(27316,23,3801.11,-678.964,213.753,5000, ''),

-(27316,24,3801.11,-678.964,213.753,5000, ''),

-(27316,25,3801.11,-678.964,213.753,5000, ''),

-(27316,26,3801.11,-678.964,213.753,5000, ''),

+DELETE FROM `script_waypoint` WHERE `entry`=27316;
+INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`,`location_y`,`location_z`,`waittime`,`point_comment`) VALUES
+(27316,1,3801.11,-678.964,213.753,5000, ''),
+(27316,2,3801.11,-678.964,213.753,5000, ''),
+(27316,3,3801.11,-678.964,213.753,5000, ''),
+(27316,4,3801.11,-678.964,213.753,5000, ''),
+(27316,5,3801.11,-678.964,213.753,5000, ''),
+(27316,6,3801.11,-678.964,213.753,5000, ''),
+(27316,7,3801.11,-678.964,213.753,5000, ''),
+(27316,8,3801.11,-678.964,213.753,5000, ''),
+(27316,9,3801.11,-678.964,213.753,5000, ''),
+(27316,10,3801.11,-678.964,213.753,5000, ''),
+(27316,11,3801.11,-678.964,213.753,5000, ''),
+(27316,12,3801.11,-678.964,213.753,5000, ''),
+(27316,13,3801.11,-678.964,213.753,5000, ''),
+(27316,14,3801.11,-678.964,213.753,5000, ''),
+(27316,15,3801.11,-678.964,213.753,5000, ''),
+(27316,16,3801.11,-678.964,213.753,5000, ''),
+(27316,17,3801.11,-678.964,213.753,5000, ''),
+(27316,18,3801.11,-678.964,213.753,5000, ''),
+(27316,19,3801.11,-678.964,213.753,5000, ''),
+(27316,20,3801.11,-678.964,213.753,5000, ''),
+(27316,21,3801.11,-678.964,213.753,5000, ''),
+(27316,22,3801.11,-678.964,213.753,5000, ''),
+(27316,23,3801.11,-678.964,213.753,5000, ''),
+(27316,24,3801.11,-678.964,213.753,5000, ''),
+(27316,25,3801.11,-678.964,213.753,5000, ''),
+(27316,26,3801.11,-678.964,213.753,5000, ''),
 (27316,27,3801.11,-678.964,213.753,10000, '');
diff --git a/sql/updates/8044_world_script_texts.sql b/sql/updates/8044_world_script_texts.sql
index 52b11c7c85f..1aa01240812 100644
--- a/sql/updates/8044_world_script_texts.sql
+++ b/sql/updates/8044_world_script_texts.sql
@@ -1,31 +1,31 @@
-DELETE FROM `script_texts` WHERE `npc_entry` IN (27316,27577);

-INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2` ,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES

-(27316,-1800041, 'Let''s you and I have a chat about some things,Godfrey.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800040, 'Return to Halford with the information the good mayor was kind enough to submit,$N,I will finish here and squeeze whatever else this wretch might know about Thel''zan. Now,I will show Godfrey the rarely shown "option three." ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800039, 'You let us worry about how we kill the bastard,Godfrey. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800036, 'What? There is a mausoleum beneath the old village? What fools we are to not have noticed. We will find and strike down your master now,Godfrey. We will end this nightmare. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800033, 'RUBBISH! Godfrey do you take me for a fool? Do not spew your Scourge propaganda at a man of the Light,heathen! Speak now or I will have the peasants craft a holy water bath and dip you into it like a dog with fleas! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800031, 'I thought you would see the Light,Godfrey... Now speak quickly,fiend. What does it say? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800030, 'The power of the Lich King pales in comparison to the glory of the Light! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800029, 'LIGHT TAKE YOU,BEAST! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800027, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800026, 'May the power of Light compel you! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800024, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800023, 'Let the sermon begin.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800022, 'I say a prayer for you now,lost soul. May the Light take you gracefully. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800021, 'Then it is option two. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800016, 'Good,I have your attention,then,Godfrey? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800015, 'GODFREY! Hear me,fiend! Hear me,for I am the Light,here to deliver you from evil! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,-1800014, 'Stand back,$N,the beast might lash out and harm you. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27316,1800017, 'We can do this in one of two ways,Godfrey. First,I will simply ask you to tell me what the unholy markings etched upon the pages of this tome mean. What say you? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL)

-(27577,-1800038, 'You cannot stop Thel''zan! He bears the dark gift,bestowed upon him by the Lich King himself! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800037, 'How? Humans truly are stupid,yes? Thel''zan the Duskbringer! Thel''zan the Lich! He who is born of human flesh and bone,sacrificed all power,protected by the Lich King! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800035, 'Humans... Beneath the earth of Wintergarde Village you built a mausoleum! Why do you think Naxxramas attacked that spot? Thel''zan hides deep in your own crypt and sends a thousand-thousand corpses at you! Perish you will... ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800034, 'NOOOO!!! I tell you! I tell you everything! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800032, 'It tells of the coming apocalypse. How this world will burn and be reborn from death. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800028, 'Never felt hurt like this! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800025, 'IT BURNSSSSS! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800020, 'The book is your salvation,yes... but nothing will you know. NOTHING I SAY! NOTHING! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

-(27577,-1800019, 'What can you do to me that Kel''Thuzad has not? That the Lich King will not? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),

+DELETE FROM `script_texts` WHERE `npc_entry` IN (27316,27577);
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2` ,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+(27316,-1800041, 'Let''s you and I have a chat about some things,Godfrey.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800040, 'Return to Halford with the information the good mayor was kind enough to submit,$N,I will finish here and squeeze whatever else this wretch might know about Thel''zan. Now,I will show Godfrey the rarely shown "option three." ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800039, 'You let us worry about how we kill the bastard,Godfrey. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800036, 'What? There is a mausoleum beneath the old village? What fools we are to not have noticed. We will find and strike down your master now,Godfrey. We will end this nightmare. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800033, 'RUBBISH! Godfrey do you take me for a fool? Do not spew your Scourge propaganda at a man of the Light,heathen! Speak now or I will have the peasants craft a holy water bath and dip you into it like a dog with fleas! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800031, 'I thought you would see the Light,Godfrey... Now speak quickly,fiend. What does it say? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800030, 'The power of the Lich King pales in comparison to the glory of the Light! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800029, 'LIGHT TAKE YOU,BEAST! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800027, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800026, 'May the power of Light compel you! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800024, 'LET THE LIGHT IN,GODFREY GODDARD! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800023, 'Let the sermon begin.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800022, 'I say a prayer for you now,lost soul. May the Light take you gracefully. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800021, 'Then it is option two. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800016, 'Good,I have your attention,then,Godfrey? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800015, 'GODFREY! Hear me,fiend! Hear me,for I am the Light,here to deliver you from evil! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,-1800014, 'Stand back,$N,the beast might lash out and harm you. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27316,1800017, 'We can do this in one of two ways,Godfrey. First,I will simply ask you to tell me what the unholy markings etched upon the pages of this tome mean. What say you? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL)
+(27577,-1800038, 'You cannot stop Thel''zan! He bears the dark gift,bestowed upon him by the Lich King himself! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800037, 'How? Humans truly are stupid,yes? Thel''zan the Duskbringer! Thel''zan the Lich! He who is born of human flesh and bone,sacrificed all power,protected by the Lich King! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800035, 'Humans... Beneath the earth of Wintergarde Village you built a mausoleum! Why do you think Naxxramas attacked that spot? Thel''zan hides deep in your own crypt and sends a thousand-thousand corpses at you! Perish you will... ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800034, 'NOOOO!!! I tell you! I tell you everything! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800032, 'It tells of the coming apocalypse. How this world will burn and be reborn from death. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800028, 'Never felt hurt like this! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800025, 'IT BURNSSSSS! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800020, 'The book is your salvation,yes... but nothing will you know. NOTHING I SAY! NOTHING! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
+(27577,-1800019, 'What can you do to me that Kel''Thuzad has not? That the Lich King will not? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL),
 (27577,-1800018, 'Tell you nothing,preacher. ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,NULL);
 
diff --git a/sql/updates/8044_world_script_waypoints.sql b/sql/updates/8044_world_script_waypoints.sql
index d2d4e41297b..a052751ff15 100644
--- a/sql/updates/8044_world_script_waypoints.sql
+++ b/sql/updates/8044_world_script_waypoints.sql
@@ -1,29 +1,29 @@
-DELETE FROM `script_waypoint` WHERE `entry`=27316;

-INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`,`location_y`,`location_z`,`waittime`,`point_comment`) VALUES

-(27316,1,3801.11,-678.964,213.753,5000, ''),

-(27316,2,3801.11,-678.964,213.753,5000, ''),

-(27316,3,3801.11,-678.964,213.753,5000, ''),

-(27316,4,3801.11,-678.964,213.753,5000, ''),

-(27316,5,3801.11,-678.964,213.753,5000, ''),

-(27316,6,3801.11,-678.964,213.753,5000, ''),

-(27316,7,3801.11,-678.964,213.753,5000, ''),

-(27316,8,3801.11,-678.964,213.753,5000, ''),

-(27316,9,3801.11,-678.964,213.753,5000, ''),

-(27316,10,3801.11,-678.964,213.753,5000, ''),

-(27316,11,3801.11,-678.964,213.753,5000, ''),

-(27316,12,3801.11,-678.964,213.753,5000, ''),

-(27316,13,3801.11,-678.964,213.753,5000, ''),

-(27316,14,3801.11,-678.964,213.753,5000, ''),

-(27316,15,3801.11,-678.964,213.753,5000, ''),

-(27316,16,3801.11,-678.964,213.753,5000, ''),

-(27316,17,3801.11,-678.964,213.753,5000, ''),

-(27316,18,3801.11,-678.964,213.753,5000, ''),

-(27316,19,3801.11,-678.964,213.753,5000, ''),

-(27316,20,3801.11,-678.964,213.753,5000, ''),

-(27316,21,3801.11,-678.964,213.753,5000, ''),

-(27316,22,3801.11,-678.964,213.753,5000, ''),

-(27316,23,3801.11,-678.964,213.753,5000, ''),

-(27316,24,3801.11,-678.964,213.753,5000, ''),

-(27316,25,3801.11,-678.964,213.753,5000, ''),

-(27316,26,3801.11,-678.964,213.753,5000, ''),

-(27316,27,3801.11,-678.964,213.753,10000, '');

+DELETE FROM `script_waypoint` WHERE `entry`=27316;
+INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`,`location_y`,`location_z`,`waittime`,`point_comment`) VALUES
+(27316,1,3801.11,-678.964,213.753,5000, ''),
+(27316,2,3801.11,-678.964,213.753,5000, ''),
+(27316,3,3801.11,-678.964,213.753,5000, ''),
+(27316,4,3801.11,-678.964,213.753,5000, ''),
+(27316,5,3801.11,-678.964,213.753,5000, ''),
+(27316,6,3801.11,-678.964,213.753,5000, ''),
+(27316,7,3801.11,-678.964,213.753,5000, ''),
+(27316,8,3801.11,-678.964,213.753,5000, ''),
+(27316,9,3801.11,-678.964,213.753,5000, ''),
+(27316,10,3801.11,-678.964,213.753,5000, ''),
+(27316,11,3801.11,-678.964,213.753,5000, ''),
+(27316,12,3801.11,-678.964,213.753,5000, ''),
+(27316,13,3801.11,-678.964,213.753,5000, ''),
+(27316,14,3801.11,-678.964,213.753,5000, ''),
+(27316,15,3801.11,-678.964,213.753,5000, ''),
+(27316,16,3801.11,-678.964,213.753,5000, ''),
+(27316,17,3801.11,-678.964,213.753,5000, ''),
+(27316,18,3801.11,-678.964,213.753,5000, ''),
+(27316,19,3801.11,-678.964,213.753,5000, ''),
+(27316,20,3801.11,-678.964,213.753,5000, ''),
+(27316,21,3801.11,-678.964,213.753,5000, ''),
+(27316,22,3801.11,-678.964,213.753,5000, ''),
+(27316,23,3801.11,-678.964,213.753,5000, ''),
+(27316,24,3801.11,-678.964,213.753,5000, ''),
+(27316,25,3801.11,-678.964,213.753,5000, ''),
+(27316,26,3801.11,-678.964,213.753,5000, ''),
+(27316,27,3801.11,-678.964,213.753,10000, '');
diff --git a/sql/updates/8044_world_scriptname.sql b/sql/updates/8044_world_scriptname.sql
index 87447bfba6d..4d85bab2854 100644
--- a/sql/updates/8044_world_scriptname.sql
+++ b/sql/updates/8044_world_scriptname.sql
@@ -1,2 +1,2 @@
-UPDATE `creature_template` SET `ScriptName`='npc_inquisitor_hallard' WHERE `entry`=27316;

+UPDATE `creature_template` SET `ScriptName`='npc_inquisitor_hallard' WHERE `entry`=27316;
 
diff --git a/src/scripts/northrend/dragonblight.cpp b/src/scripts/northrend/dragonblight.cpp
index 59832c5e6ec..a8037f83bfb 100644
--- a/src/scripts/northrend/dragonblight.cpp
+++ b/src/scripts/northrend/dragonblight.cpp
@@ -58,200 +58,200 @@ bool GossipSelect_npc_alexstrasza_wr_gate(Player* pPlayer, Creature* /*pCreature
     }
 
     return true;
-}

-

-/*######

-## npc_inquisitor_hallard. Quest 12321

-######*/

-

-

-enum eInquisitor

-{    

-    NPC_GODFREY                 = 27577,

-    SPELL_HOLY_FIRE             = 39323,

-

-    SAY_WP_0                    = -1800014,

-    SAY_WP_1                    = -1800015,

-    SAY_WP_2                    = -1800016,

-    SAY_WP_3                    = -1800017,

-    SAY_WP_4                    = -1800018,

-    SAY_WP_5                    = -1800019,

-    SAY_WP_6                    = -1800020,

-    SAY_WP_7                    = -1800021,

-    SAY_WP_8                    = -1800022,

-    SAY_WP_9                    = -1800023,

-    SAY_WP_10                   = -1800024,

-    SAY_WP_11                   = -1800025,

-    SAY_WP_12                   = -1800026,

-    SAY_WP_13                   = -1800027,

-    SAY_WP_14                   = -1800028,

-    SAY_WP_15                   = -1800029,

-    SAY_WP_16                   = -1800030,

-    SAY_WP_17                   = -1800031,

-    SAY_WP_18                   = -1800032,

-    SAY_WP_19                   = -1800033,

-    SAY_WP_20                   = -1800034,

-    SAY_WP_21                   = -1800035,

-    SAY_WP_22                   = -1800036,

-    SAY_WP_23                   = -1800037,

-    SAY_WP_24                   = -1800038,

-    SAY_WP_25                   = -1800039,

-    SAY_WP_26                   = -1800040,

-    SAY_WP_27                   = -1800041

-};

-

-#define QUEST_A_RIGHTEOUS_SERMON     12321

-

-struct npc_inquisitor_hallardAI : public npc_escortAI

-{    

-    npc_inquisitor_hallardAI(Creature* pCreature) : npc_escortAI(pCreature) { }

-

-    bool Completed;

-

-    void WaypointReached(uint32 i)

-    {

-        Player* pPlayer = GetPlayerForEscort();

-        if (!pPlayer)

-            return;

-        Creature* Godfrey = m_creature->FindNearestCreature(NPC_GODFREY, 50, true);

-        if (!Godfrey)

-            return;  

-        switch (i)

-        {

-            case 1:                

-                DoScriptText(SAY_WP_1, m_creature, Godfrey);

-                m_creature->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID());

-                m_creature->HandleEmoteCommand(5);

-                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);

-                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);                

-                break;

-            case 2:

-                Godfrey->HandleEmoteCommand(434);

-                DoScriptText(SAY_WP_2, m_creature, Godfrey);

-                m_creature->HandleEmoteCommand(15);

-                break;

-            case 3:                

-                DoScriptText(SAY_WP_3, m_creature, Godfrey);

-                m_creature->HandleEmoteCommand(1);

-                break;

-            case 4:

-                DoScriptText(SAY_WP_4, Godfrey);

-                break;

-            case 5:

-                DoScriptText(SAY_WP_5, Godfrey);

-                break;

-            case 6:

-                DoScriptText(SAY_WP_6, Godfrey);

-                break;

-            case 7:

-                DoScriptText(SAY_WP_7, m_creature, Godfrey);

-                m_creature->HandleEmoteCommand(1);

-                break;

-            case 8:

-                DoScriptText(SAY_WP_8, m_creature, Godfrey);

-                m_creature->HandleEmoteCommand(16);

-                break;

-            case 9:

-                DoScriptText(SAY_WP_9, m_creature, Godfrey);                

-                m_creature->HandleEmoteCommand(5);

-                break;

-            case 10:

-                DoScriptText(SAY_WP_10, m_creature, Godfrey);

-                DoCast(Godfrey, SPELL_HOLY_FIRE);

-                break;

-            case 11:

-                Godfrey->HandleEmoteCommand(434);

-                DoScriptText(SAY_WP_11, Godfrey);

-                break;

-            case 12:

-                DoScriptText(SAY_WP_12, m_creature, Godfrey);

-                DoCast(Godfrey, SPELL_HOLY_FIRE);

-                break;

-            case 13:

-                DoScriptText(SAY_WP_13, m_creature, Godfrey);

-                DoCast(Godfrey, SPELL_HOLY_FIRE);

-                break;

-            case 14:

-                Godfrey->HandleEmoteCommand(434);

-                DoScriptText(SAY_WP_14, Godfrey);

-                break;

-            case 15:

-                DoScriptText(SAY_WP_15, m_creature, Godfrey);

-                DoCast(Godfrey, SPELL_HOLY_FIRE);

-                break;

-            case 16:

-                DoScriptText(SAY_WP_16, m_creature, Godfrey);

-                break;

-            case 17:

-                DoScriptText(SAY_WP_17, m_creature, Godfrey);

-                break;

-            case 18:

-                DoScriptText(SAY_WP_18, Godfrey);

-                break;

-            case 19:

-                DoScriptText(SAY_WP_19, m_creature, Godfrey);

-                break;

-            case 20:

-                DoScriptText(SAY_WP_20, Godfrey);

-                break;

-            case 21:

-                DoScriptText(SAY_WP_21, Godfrey);

-                break;

-            case 22:

-                DoScriptText(SAY_WP_22, m_creature, Godfrey);

-                break;

-            case 23:

-                DoScriptText(SAY_WP_23, Godfrey);

-                break;

-            case 24:

-                DoScriptText(SAY_WP_24, Godfrey);

-                break;

-            case 25:

-                DoScriptText(SAY_WP_25, m_creature, Godfrey);

-                break;

-            case 26:

-                DoScriptText(SAY_WP_26, m_creature);

-                m_creature->SetUInt64Value(UNIT_FIELD_TARGET, pPlayer->GetGUID());

-                break;

-            case 27:

-                DoScriptText(SAY_WP_27, m_creature, Godfrey);

-                m_creature->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID());

-                Completed = true;                

-                if (pPlayer)

-                    pPlayer->GroupEventHappens(QUEST_A_RIGHTEOUS_SERMON, m_creature);

-                break;                          

-        }

-    }

-

-    void Reset()

-    {  

-        Completed = false;

-    }    

-

-    void UpdateAI(const uint32 diff)

-    {          

-        npc_escortAI::UpdateAI(diff);             

-    }

-};

-

-bool QuestAccept_npc_inquisitor_hallard(Player* pPlayer, Creature* pCreature, Quest const* quest)

-{

-    if (quest->GetQuestId() == QUEST_A_RIGHTEOUS_SERMON)

-    {        

-        DoScriptText(SAY_WP_0, pCreature, pPlayer);

-        if (npc_escortAI* pEscortAI = CAST_AI(npc_inquisitor_hallardAI, pCreature->AI()))

-        {

-            pEscortAI->Start(true, false, pPlayer->GetGUID(), 0, true);

-            pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75);            

-        }

-    }

-    return true;

-}

-

-CreatureAI* GetAI_npc_inquisitor_hallard(Creature* pCreature)

-{

-    return new npc_inquisitor_hallardAI(pCreature);

-}

+}
+
+/*######
+## npc_inquisitor_hallard. Quest 12321
+######*/
+
+
+enum eInquisitor
+{    
+    NPC_GODFREY                 = 27577,
+    SPELL_HOLY_FIRE             = 39323,
+
+    SAY_WP_0                    = -1800014,
+    SAY_WP_1                    = -1800015,
+    SAY_WP_2                    = -1800016,
+    SAY_WP_3                    = -1800017,
+    SAY_WP_4                    = -1800018,
+    SAY_WP_5                    = -1800019,
+    SAY_WP_6                    = -1800020,
+    SAY_WP_7                    = -1800021,
+    SAY_WP_8                    = -1800022,
+    SAY_WP_9                    = -1800023,
+    SAY_WP_10                   = -1800024,
+    SAY_WP_11                   = -1800025,
+    SAY_WP_12                   = -1800026,
+    SAY_WP_13                   = -1800027,
+    SAY_WP_14                   = -1800028,
+    SAY_WP_15                   = -1800029,
+    SAY_WP_16                   = -1800030,
+    SAY_WP_17                   = -1800031,
+    SAY_WP_18                   = -1800032,
+    SAY_WP_19                   = -1800033,
+    SAY_WP_20                   = -1800034,
+    SAY_WP_21                   = -1800035,
+    SAY_WP_22                   = -1800036,
+    SAY_WP_23                   = -1800037,
+    SAY_WP_24                   = -1800038,
+    SAY_WP_25                   = -1800039,
+    SAY_WP_26                   = -1800040,
+    SAY_WP_27                   = -1800041
+};
+
+#define QUEST_A_RIGHTEOUS_SERMON     12321
+
+struct npc_inquisitor_hallardAI : public npc_escortAI
+{    
+    npc_inquisitor_hallardAI(Creature* pCreature) : npc_escortAI(pCreature) { }
+
+    bool Completed;
+
+    void WaypointReached(uint32 i)
+    {
+        Player* pPlayer = GetPlayerForEscort();
+        if (!pPlayer)
+            return;
+        Creature* Godfrey = m_creature->FindNearestCreature(NPC_GODFREY, 50, true);
+        if (!Godfrey)
+            return;  
+        switch (i)
+        {
+            case 1:                
+                DoScriptText(SAY_WP_1, m_creature, Godfrey);
+                m_creature->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID());
+                m_creature->HandleEmoteCommand(5);
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
+                m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);                
+                break;
+            case 2:
+                Godfrey->HandleEmoteCommand(434);
+                DoScriptText(SAY_WP_2, m_creature, Godfrey);
+                m_creature->HandleEmoteCommand(15);
+                break;
+            case 3:                
+                DoScriptText(SAY_WP_3, m_creature, Godfrey);
+                m_creature->HandleEmoteCommand(1);
+                break;
+            case 4:
+                DoScriptText(SAY_WP_4, Godfrey);
+                break;
+            case 5:
+                DoScriptText(SAY_WP_5, Godfrey);
+                break;
+            case 6:
+                DoScriptText(SAY_WP_6, Godfrey);
+                break;
+            case 7:
+                DoScriptText(SAY_WP_7, m_creature, Godfrey);
+                m_creature->HandleEmoteCommand(1);
+                break;
+            case 8:
+                DoScriptText(SAY_WP_8, m_creature, Godfrey);
+                m_creature->HandleEmoteCommand(16);
+                break;
+            case 9:
+                DoScriptText(SAY_WP_9, m_creature, Godfrey);                
+                m_creature->HandleEmoteCommand(5);
+                break;
+            case 10:
+                DoScriptText(SAY_WP_10, m_creature, Godfrey);
+                DoCast(Godfrey, SPELL_HOLY_FIRE);
+                break;
+            case 11:
+                Godfrey->HandleEmoteCommand(434);
+                DoScriptText(SAY_WP_11, Godfrey);
+                break;
+            case 12:
+                DoScriptText(SAY_WP_12, m_creature, Godfrey);
+                DoCast(Godfrey, SPELL_HOLY_FIRE);
+                break;
+            case 13:
+                DoScriptText(SAY_WP_13, m_creature, Godfrey);
+                DoCast(Godfrey, SPELL_HOLY_FIRE);
+                break;
+            case 14:
+                Godfrey->HandleEmoteCommand(434);
+                DoScriptText(SAY_WP_14, Godfrey);
+                break;
+            case 15:
+                DoScriptText(SAY_WP_15, m_creature, Godfrey);
+                DoCast(Godfrey, SPELL_HOLY_FIRE);
+                break;
+            case 16:
+                DoScriptText(SAY_WP_16, m_creature, Godfrey);
+                break;
+            case 17:
+                DoScriptText(SAY_WP_17, m_creature, Godfrey);
+                break;
+            case 18:
+                DoScriptText(SAY_WP_18, Godfrey);
+                break;
+            case 19:
+                DoScriptText(SAY_WP_19, m_creature, Godfrey);
+                break;
+            case 20:
+                DoScriptText(SAY_WP_20, Godfrey);
+                break;
+            case 21:
+                DoScriptText(SAY_WP_21, Godfrey);
+                break;
+            case 22:
+                DoScriptText(SAY_WP_22, m_creature, Godfrey);
+                break;
+            case 23:
+                DoScriptText(SAY_WP_23, Godfrey);
+                break;
+            case 24:
+                DoScriptText(SAY_WP_24, Godfrey);
+                break;
+            case 25:
+                DoScriptText(SAY_WP_25, m_creature, Godfrey);
+                break;
+            case 26:
+                DoScriptText(SAY_WP_26, m_creature);
+                m_creature->SetUInt64Value(UNIT_FIELD_TARGET, pPlayer->GetGUID());
+                break;
+            case 27:
+                DoScriptText(SAY_WP_27, m_creature, Godfrey);
+                m_creature->SetUInt64Value(UNIT_FIELD_TARGET, Godfrey->GetGUID());
+                Completed = true;                
+                if (pPlayer)
+                    pPlayer->GroupEventHappens(QUEST_A_RIGHTEOUS_SERMON, m_creature);
+                break;                          
+        }
+    }
+
+    void Reset()
+    {  
+        Completed = false;
+    }    
+
+    void UpdateAI(const uint32 diff)
+    {          
+        npc_escortAI::UpdateAI(diff);             
+    }
+};
+
+bool QuestAccept_npc_inquisitor_hallard(Player* pPlayer, Creature* pCreature, Quest const* quest)
+{
+    if (quest->GetQuestId() == QUEST_A_RIGHTEOUS_SERMON)
+    {        
+        DoScriptText(SAY_WP_0, pCreature, pPlayer);
+        if (npc_escortAI* pEscortAI = CAST_AI(npc_inquisitor_hallardAI, pCreature->AI()))
+        {
+            pEscortAI->Start(true, false, pPlayer->GetGUID(), 0, true);
+            pCreature->GetMotionMaster()->MovePoint(0, 3801.543, -679.350, 213.75);            
+        }
+    }
+    return true;
+}
+
+CreatureAI* GetAI_npc_inquisitor_hallard(Creature* pCreature)
+{
+    return new npc_inquisitor_hallardAI(pCreature);
+}
 
 void AddSC_dragonblight()
 {
@@ -263,10 +263,10 @@ void AddSC_dragonblight()
     newscript->pGossipSelect = &GossipSelect_npc_alexstrasza_wr_gate;
     newscript->RegisterSelf();
 
-    newscript = new Script;

-    newscript->Name = "npc_inquisitor_hallard";

-    newscript->GetAI = &GetAI_npc_inquisitor_hallard;

-    newscript->pQuestAccept = &QuestAccept_npc_inquisitor_hallard;

-    newscript->RegisterSelf();

+    newscript = new Script;
+    newscript->Name = "npc_inquisitor_hallard";
+    newscript->GetAI = &GetAI_npc_inquisitor_hallard;
+    newscript->pQuestAccept = &QuestAccept_npc_inquisitor_hallard;
+    newscript->RegisterSelf();
 
 }