From 57e1972b86a0f1dae1ab8c7832814df000407c71 Mon Sep 17 00:00:00 2001 From: malcrom Date: Sun, 8 Jan 2012 13:34:49 +0100 Subject: [PATCH] Core/Script: update creature_text for the Paladin Trial Quests in Eversong from sniffs closes #4699 --- .../world/2012_01_08_11_world_creature_text.sql | 9 +++++++++ .../scripts/EasternKingdoms/eversong_woods.cpp | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 sql/updates/world/2012_01_08_11_world_creature_text.sql diff --git a/sql/updates/world/2012_01_08_11_world_creature_text.sql b/sql/updates/world/2012_01_08_11_world_creature_text.sql new file mode 100644 index 0000000000..bf34c1f541 --- /dev/null +++ b/sql/updates/world/2012_01_08_11_world_creature_text.sql @@ -0,0 +1,9 @@ +-- Remove old script text for eversong_woods.cpp +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000637 AND -1000640; +-- Master Kelerun Bloodmourn say text +DELETE FROM `creature_text` WHERE `entry`=17807; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(17807,0,0, 'Let the trial begin, Bloodwrath, attack!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn'), +(17807,1,0, 'Champion Lightrend, make me proud!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn'), +(17807,2,0, 'Show this upstart how a real Blood Knight fights, Swiftblade!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn'), +(17807,3,0, 'Show $N the meaning of pain, Sunstriker!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn'); diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index 7c09a740d2..4797774ef4 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -69,10 +69,10 @@ enum eFaction enum eSays { - TEXT_SECOND_TRIAL_1 = -1000637, - TEXT_SECOND_TRIAL_2 = -1000638, - TEXT_SECOND_TRIAL_3 = -1000639, - TEXT_SECOND_TRIAL_4 = -1000640, + TEXT_SECOND_TRIAL_1 = 0, + TEXT_SECOND_TRIAL_2 = 1, + TEXT_SECOND_TRIAL_3 = 2, + TEXT_SECOND_TRIAL_4 = 3, }; struct Locations @@ -335,16 +335,16 @@ public: switch (paladinPhase) { case 0: - DoScriptText(TEXT_SECOND_TRIAL_1, me); + Talk(TEXT_SECOND_TRIAL_1); break; case 1: - DoScriptText(TEXT_SECOND_TRIAL_2, me); + Talk(TEXT_SECOND_TRIAL_2); break; case 2: - DoScriptText(TEXT_SECOND_TRIAL_3, me); + Talk(TEXT_SECOND_TRIAL_3); break; case 3: - DoScriptText(TEXT_SECOND_TRIAL_4, me); + Talk(TEXT_SECOND_TRIAL_4); break; } }