diff options
| -rw-r--r-- | sql/updates/world/3.3.5/9999_99_99_99_world.sql | 12 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp | 72 |
2 files changed, 73 insertions, 11 deletions
diff --git a/sql/updates/world/3.3.5/9999_99_99_99_world.sql b/sql/updates/world/3.3.5/9999_99_99_99_world.sql new file mode 100644 index 00000000000..bfa5dd72b69 --- /dev/null +++ b/sql/updates/world/3.3.5/9999_99_99_99_world.sql @@ -0,0 +1,12 @@ +-- +UPDATE `creature_text` SET `language`=7, `BroadcastTextid`=13770 WHERE `entry`=17312 AND `groupid`=1; +UPDATE `creature_text` SET `emote`=5 WHERE `entry`=17312 AND `groupid`=2; +UPDATE `creature_text` SET `emote`=22 WHERE `entry`=17312 AND `groupid`=3; +UPDATE `creature_text` SET `emote`=5 WHERE `entry`=17312 AND `groupid`=4; + +DELETE FROM `creature_text` WHERE `entry`=17311; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES +(17311, 0, 0, (SELECT `MaleText` FROM `broadcast_text` WHERE `ID`=13749), 12, 7, 100, 0, 0, 0, 13749, 0, "Cowlen"); + +UPDATE `script_waypoint` SET `waittime`=3000 WHERE `entry`=17312 AND `pointid`=28; +UPDATE `script_waypoint` SET `waittime`=5000 WHERE `entry`=17312 AND `pointid`=29; diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index c47971836ac..fdc9b0c12ff 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -331,7 +331,14 @@ enum Magwin SAY_END1 = 3, SAY_END2 = 4, EMOTE_HUG = 5, - QUEST_A_CRY_FOR_SAY_HELP = 9528, + NPC_COWLEN = 17311, + SAY_COWLEN = 0, + EVENT_ACCEPT_QUEST = 1, + EVENT_START_ESCORT = 2, + EVENT_STAND = 3, + EVENT_TALK_END = 4, + EVENT_COWLEN_TALK = 5, + QUEST_A_CRY_FOR_HELP = 9528, FACTION_QUEST = 113 }; @@ -344,7 +351,10 @@ public: { npc_magwinAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() override { } + void Reset() override + { + _events.Reset(); + } void EnterCombat(Unit* who) override { @@ -353,10 +363,10 @@ public: void sQuestAccept(Player* player, Quest const* quest) override { - if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP) + if (quest->GetQuestId() == QUEST_A_CRY_FOR_HELP) { - me->setFaction(FACTION_QUEST); - npc_escortAI::Start(true, false, player->GetGUID()); + _player = player->GetGUID(); + _events.ScheduleEvent(EVENT_ACCEPT_QUEST, Seconds(2)); } } @@ -366,23 +376,63 @@ public: { switch (waypointId) { - case 0: - Talk(SAY_START, player); - break; case 17: Talk(SAY_PROGRESS, player); break; case 28: - Talk(SAY_END1, player); + player->GroupEventHappens(QUEST_A_CRY_FOR_HELP, me); + _events.ScheduleEvent(EVENT_TALK_END, Seconds(2)); + SetRun(true); break; case 29: - Talk(EMOTE_HUG, player); + if (Creature* cowlen = me->FindNearestCreature(NPC_COWLEN, 50.0f, true)) + Talk(EMOTE_HUG, cowlen); Talk(SAY_END2, player); - player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); break; } } } + + void UpdateEscortAI(uint32 diff) override + { + _events.Update(diff); + + if (uint32 eventId = _events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_ACCEPT_QUEST: + if (Player* player = ObjectAccessor::GetPlayer(*me, _player)) + Talk(SAY_START, player); + me->setFaction(FACTION_QUEST); + _events.ScheduleEvent(EVENT_START_ESCORT, Seconds(1)); + break; + case EVENT_START_ESCORT: + if (Player* player = ObjectAccessor::GetPlayer(*me, _player)) + npc_escortAI::Start(true, false, player->GetGUID()); + _events.ScheduleEvent(EVENT_STAND, Seconds(2)); + break; + case EVENT_STAND: // Remove kneel standstate. Using a separate delayed event because it causes unwanted delay before starting waypoint movement. + me->SetByteValue(UNIT_FIELD_BYTES_1, 0, 0); + break; + case EVENT_TALK_END: + if (Player* player = ObjectAccessor::GetPlayer(*me, _player)) + Talk(SAY_END1, player); + _events.ScheduleEvent(EVENT_COWLEN_TALK, Seconds(2)); + break; + case EVENT_COWLEN_TALK: + if (Creature* cowlen = me->FindNearestCreature(NPC_COWLEN, 50.0f, true)) + cowlen->AI()->Talk(SAY_COWLEN); + break; + } + } + + npc_escortAI::UpdateEscortAI(diff); + } + + private: + EventMap _events; + ObjectGuid _player; }; CreatureAI* GetAI(Creature* creature) const override |