Scripts/Quests: Zuhuled the Wacked

And obviously, some typo's.

Closes #3704

4 files changed, 21 insertions, 13 deletions

diff --git a/sql/updates/world/2011_12_25_00_world_misc.sql b/sql/updates/world/2011_12_25_00_world_misc.sql
index 22effda3d04..8f1d3c44ceb 100644
--- a/sql/updates/world/2011_12_25_00_world_misc.sql
+++ b/sql/updates/world/2011_12_25_00_world_misc.sql
@@ -5,5 +5,5 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 (20787,0,0,"You've saved me, fleshling! Ameer will hear of this noble act.",12,0,100,0,0,0,"Captain Tyralius");
 
 -- Heroes of Old
-UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `entry`=2702;
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=2702;
 DELETE FROM `quest_start_scripts` WHERE `id`=2702;
diff --git a/sql/updates/world/2011_12_25_01_world_misc.sql b/sql/updates/world/2011_12_25_01_world_misc.sql
new file mode 100644
index 00000000000..9e4d7e6c058
--- /dev/null
+++ b/sql/updates/world/2011_12_25_01_world_misc.sql
@@ -0,0 +1,3 @@
+-- Zuhuled the Wacked
+UPDATE `quest_template` SET `StartScript`=0,`CompleteScript`=0 WHERE `id`=10866;
+DELETE FROM `quest_start_scripts` WHERE `id`=10866;
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 610cf684a77..ecbdb921567 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -635,26 +635,31 @@ public:
 # npc_karynaku
 ####*/
 
-enum eKarynaku
+enum Karynaku
 {
     QUEST_ALLY_OF_NETHER    = 10870,
+    QUEST_ZUHULED_THE_WACK  = 10866,
 
-    TAXI_PATH_ID            = 649
+    NPC_ZUHULED_THE_WACKED  = 11980,
+
+    TAXI_PATH_ID            = 649,
 };
 
 class npc_karynaku : public CreatureScript
 {
-public:
-    npc_karynaku() : CreatureScript("npc_karynaku") { }
+    public:
+        npc_karynaku() : CreatureScript("npc_karynaku") { }
 
-    bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const* quest)
-    {
-        if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER)
-            player->ActivateTaxiPathTo(TAXI_PATH_ID);        //player->ActivateTaxiPathTo(649);
+        bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
+        {
+            if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER)
+                player->ActivateTaxiPathTo(TAXI_PATH_ID);
 
-        return true;
-    }
+            if (quest->GetQuestId() == QUEST_ZUHULED_THE_WACK)
+                creature->SummonCreature(NPC_ZUHULED_THE_WACKED, -4204.94f, 316.397f, 122.508f, 1.309f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 300000);
 
+            return true;
+        }
 };
 
 /*####
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index fad92ec1af5..e93dd2751e6 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -1289,7 +1289,7 @@ enum MissingFriends
 {
    QUEST_MISSING_FRIENDS    = 10852,
    NPC_CAPTIVE_CHILD        = 22314,
-   SAY_FREE                 = 0,
+   SAY_FREE_0               = 0,
 };
 
 class go_veil_skith_cage : public GameObjectScript
@@ -1309,7 +1309,7 @@ class go_veil_skith_cage : public GameObjectScript
                    player->KilledMonsterCredit(NPC_CAPTIVE_CHILD, (*itr)->GetGUID());
                    (*itr)->ForcedDespawn(5000);
                    (*itr)->GetMotionMaster()->MovePoint(1, go->GetPositionX()+5, go->GetPositionY(), go->GetPositionZ());
-                   (*itr)->AI()->Talk(SAY_FREE);
+                   (*itr)->AI()->Talk(SAY_FREE_0);
                    (*itr)->GetMotionMaster()->Clear();
                }
            }