Script/BoreanTundra: Fix dialog and final waypoint for quest 11570: "Escape from the Winterfin Caverns"

This fixes the following bugs:

Escortee NPC quotes are out of order (see #15396 (comment))
Final escort waypoint is located incorrectly and causes the escorted NPC to drop all the way to the bottom of the ocean before quest completion is awarded.

Closes #15396

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
This commit is contained in:
treeston
2015-09-02 02:02:34 +01:00
committed by DDuarte
parent b7f9836d22
commit a83437af3d
2 changed files with 13 additions and 4 deletions

View File

@@ -0,0 +1,7 @@
-- Waypoint fix for quest "Escape from the Winterfin Caverns" (11570)
UPDATE `script_waypoint` SET `location_x`=4279.54, `location_y`=6187.932, `location_z`=0.294670 WHERE `entry`=25208 AND `pointid`=41;
-- Swap 1st and 2nd text
UPDATE `creature_text` SET `groupid` = 99 WHERE `entry` = 25208 AND `groupid` = 0 AND `id` = 0;
UPDATE `creature_text` SET `groupid` = 0 WHERE `entry` = 25208 AND `groupid` = 1 AND `id` = 0;
UPDATE `creature_text` SET `groupid` = 1 WHERE `entry` = 25208 AND `groupid` = 99 AND `id` = 0;

View File

@@ -596,12 +596,13 @@ public:
switch (IntroPhase)
{
case 1:
Talk(SAY_START_1);
if (Player* player = GetPlayerForEscort())
Talk(SAY_START_1, player);
IntroPhase = 2;
IntroTimer = 7500;
break;
case 2:
Talk(SAY_END_1);
Talk(SAY_START_2);
IntroPhase = 3;
IntroTimer = 7500;
break;
@@ -611,12 +612,13 @@ public:
IntroTimer = 0;
break;
case 4:
Talk(SAY_START_2);
Talk(SAY_END_1);
IntroPhase = 5;
IntroTimer = 8000;
break;
case 5:
Talk(SAY_END_2);
if (Player* player = GetPlayerForEscort())
Talk(SAY_END_2, player);
IntroPhase = 6;
IntroTimer = 2500;
break;