diff options
| -rw-r--r-- | sql/updates/world/master/2017_01_12_33_2016_06_13_04_world.sql | 2 | ||||
| -rw-r--r-- | src/server/scripts/Events/childrens_week.cpp | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/sql/updates/world/master/2017_01_12_33_2016_06_13_04_world.sql b/sql/updates/world/master/2017_01_12_33_2016_06_13_04_world.sql new file mode 100644 index 00000000000..d2ad9c21b39 --- /dev/null +++ b/sql/updates/world/master/2017_01_12_33_2016_06_13_04_world.sql @@ -0,0 +1,2 @@ +UPDATE `creature_template` SET `AIName`='' WHERE `entry`=28092; +DELETE FROM `smart_scripts` WHERE `entryorguid`=28092 AND `source_type`=0; diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 77f114b2b80..ea4382d93e9 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -639,6 +639,12 @@ class npc_elder_kekek : public CreatureScript } }; +enum TheEtymidian +{ + SAY_ACTIVATION = 0, + QUEST_THE_ACTIVATION_RUNE = 12547 +}; + /*###### ## npc_the_etymidian ## @todo A red crystal as a gift for the great one should be spawned during the event. @@ -668,10 +674,20 @@ class npc_the_etymidian : public CreatureScript Initialize(); } + void sQuestReward(Player* /*player*/, Quest const* quest, uint32 /*opt*/) override + { + if (quest->GetQuestId() != QUEST_THE_ACTIVATION_RUNE) + return; + + Talk(SAY_ACTIVATION); + } + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) + { if (Player* player = who->ToPlayer()) + { if (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) == QUEST_STATUS_INCOMPLETE) { playerGUID = player->GetGUID(); @@ -679,6 +695,8 @@ class npc_the_etymidian : public CreatureScript if (!orphanGUID.IsEmpty()) phase = 1; } + } + } } void UpdateAI(uint32 diff) override @@ -734,7 +752,6 @@ class npc_the_etymidian : public CreatureScript int8 phase; ObjectGuid playerGUID; ObjectGuid orphanGUID; - }; CreatureAI* GetAI(Creature* creature) const override |