diff options
| author | Malcrom <malcromdev@gmail.com> | 2012-02-19 21:30:43 -0330 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2012-02-19 21:30:43 -0330 |
| commit | 35bc842fdeb6f6d3739bc79e4d8c94fb97e3a729 (patch) | |
| tree | 43db591c20b2e432165e2222fe9248c8f0c3b5d3 | |
| parent | c6f4ab10e1a90c75799c23a2420a1822abfc5ac5 (diff) | |
Scripts/npc_sergeant_bly: Talk text was placholders. Replaced with Creature text.
| -rw-r--r-- | sql/updates/world/2012_02_19_05_world_say_text.sql | 7 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sql/updates/world/2012_02_19_05_world_say_text.sql b/sql/updates/world/2012_02_19_05_world_say_text.sql new file mode 100644 index 00000000000..b70385660a1 --- /dev/null +++ b/sql/updates/world/2012_02_19_05_world_say_text.sql @@ -0,0 +1,7 @@ +-- NPC talk text from sniff +DELETE FROM `creature_text` WHERE `entry`=7604; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(7604,0,0, 'What? How dare you say that to me?!?',12,0,100,6,0,0, 'Sergeant Bly'), +(7604,1,0, 'After all we''ve been through? Well, I didn''t like you anyway!!',12,0,100,5,0,0, 'Sergeant Bly'); +-- Remove old text +DELETE FROM `script_texts` WHERE `entry` IN (-1209002,-1209003); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index dd90eaa0e7f..61fe526407c 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -44,8 +44,8 @@ enum blyAndCrewFactions enum blySays { - SAY_1 = -1209002, - SAY_2 = -1209003 + SAY_1 = 0, + SAY_2 = 1 }; enum blySpells @@ -133,11 +133,11 @@ public: //weegli doesn't fight - he goes & blows up the door if (Creature* pWeegli = instance->instance->GetCreature(instance->GetData64(ENTRY_WEEGLI))) pWeegli->AI()->DoAction(0); - DoScriptText(SAY_1, me); + Talk(SAY_1); Text_Timer = 5000; break; case 2: - DoScriptText(SAY_2, me); + Talk(SAY_2); Text_Timer = 5000; break; case 3: |