From fc59e032ad1da58fafbeae4db7c8311fd6a7a083 Mon Sep 17 00:00:00 2001 From: Tekkub Stoutwrithe Date: Fri, 7 Sep 2007 09:19:02 +0000 Subject: [PATCH] TourGuide - ONCE AGAIN I THINK I'VE FIXED THE FUCKING QUEST DETECTION.... for the next hour... - More guide tweakings after playing git-svn-id: https://tekkub-wow.googlecode.com/svn/trunk/TourGuide@516 86fe6d9a-1522-0410-a387-bf9db416f0a0 --- Alliance/67_69_Netherstorm.lua | 9 +++++---- Horde/13_20_Ghostlands.lua | 8 ++++---- QuestTracking.lua | 33 +++++++++++++++------------------ 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Alliance/67_69_Netherstorm.lua b/Alliance/67_69_Netherstorm.lua index 88548a2..7912ddb 100644 --- a/Alliance/67_69_Netherstorm.lua +++ b/Alliance/67_69_Netherstorm.lua @@ -199,14 +199,14 @@ C A Heap of Ethereals T Pick Your Part |N|Back at Area 52| A In A Scrap With The Legion -A "Help Mama Wheeler +A Help Mama Wheeler T A Heap of Ethereals A Warp-Raider Nesaad T Shutting Down Manaforge B'naar A Shutting Down Manaforge Coruu A Attack on Manaforge Coruu -C Warp-Raider Nesaad |N|Back at The Heap (27,80)| +C Warp-Raider Nesaad |N|Back at The Heap (28,80)| C Shutting Down Manaforge Coruu |N|East over the bridge (46,81). Kill Overseer Seylanna (49,81) and use the console, like before.| C Attack on Manaforge Coruu @@ -235,7 +235,7 @@ A The Dynamic Duo R Area 52 T In A Scrap With The Legion T Warp-Raider Nesaad -A Request For Assistance +A Request for Assistance T Shutting Down Manaforge Coruu A Shutting Down Manaforge Duro T Attack on Manaforge Coruu @@ -269,7 +269,8 @@ N You should be ~80% to 69 R Stormspire |N|Follow the road out to the bigger dome (41,32)| A Flora of the Eco-Domes -T To the Stormspire +T Deal With the Saboteurs +A To the Stormspire A Diagnosis: Critical A Surveying the Ruins A The Minions of Culuthas diff --git a/Horde/13_20_Ghostlands.lua b/Horde/13_20_Ghostlands.lua index ae2f0cc..aed7a90 100644 --- a/Horde/13_20_Ghostlands.lua +++ b/Horde/13_20_Ghostlands.lua @@ -119,20 +119,20 @@ A Assault on Zeb'Nowa T Hints of the Past A Report to Magister Kaendris -C Troll Juju +C Troll Juju |N|West of the enclave (66,29). Work your way to the questgiver inside in a cage (63,33)| C Investigate the Amani Catacombs A Escape from the Catacombs C Escape from the Catacombs +T Escape from the Catacombs -R Zeb'Nowa |N|South| +R Zeb'Nowa |N|South (68,51)| +C A Little Dash of Seasoning |N|Fish rack (68,57), raw meat rack (65,66), smoked meat rack (63,75n)| C Shadowpine Weaponry C Assault on Zeb'Nowa -C A Little Dash of Seasoning |N|Fish rack (68,57), raw meat rack (65,66), smoked meat rack (62,74)| C Bring Me Kel'gash's Head! |N|He's elite, if you can't solo him get a group or come back later (65,79)| |O| C Deactivate An'owyn R Farstrider Enclave -T Escape from the Catacombs T Bring Me Kel'gash's Head! |O| T Assault on Zeb'Nowa T A Little Dash of Seasoning diff --git a/QuestTracking.lua b/QuestTracking.lua index 18bbc1a..0f9eda8 100644 --- a/QuestTracking.lua +++ b/QuestTracking.lua @@ -4,7 +4,7 @@ local TourGuide = TourGuide local hadquest -TourGuide.TrackEvents = {"CHAT_MSG_LOOT", "CHAT_MSG_SYSTEM", "QUEST_COMPLETE", "UNIT_QUEST_LOG_UPDATE", "QUEST_WATCH_UPDATE", "QUEST_LOG_UPDATE", +TourGuide.TrackEvents = {"CHAT_MSG_LOOT", "CHAT_MSG_SYSTEM", "QUEST_COMPLETE", "QUEST_WATCH_UPDATE", "QUEST_LOG_UPDATE", "ZONE_CHANGED", "ZONE_CHANGED_INDOORS", "MINIMAP_ZONE_CHANGED", "ZONE_CHANGED_NEW_AREA"} @@ -44,11 +44,11 @@ function TourGuide:CHAT_MSG_SYSTEM(event, msg) if quest:gsub("%s%(Part %d+%)", "") == text then self:DebugF(1, "Detected quest turnin %q", quest) - return self:SetTurnedIn() +--~ return self:SetTurnedIn() end self:Debug(1, "Detected early turnin, searching for quest...") - self:CompleteQuest(text) +--~ self:CompleteQuest(text) end @@ -63,19 +63,6 @@ function TourGuide:QUEST_COMPLETE(event) end -function TourGuide:UNIT_QUEST_LOG_UPDATE(event, unit) - if unit ~= "player" or not hadquest then return end - self:Debug(10, "UNIT_QUEST_LOG_UPDATE") - - local action, quest, note, logi, complete, hasitem, turnedin = self:GetCurrentObjectiveInfo() - if hadquest == quest and not logi then - self:DebugF(1, "Chain turnin detected, %q - %q", action, quest) - self:UpdateStatusFrame() - end - hadquest = nil -end - - function TourGuide:QUEST_WATCH_UPDATE(event) if self:GetCurrentObjectiveInfo() == "COMPLETE" then self:UpdateStatusFrame() end end @@ -89,9 +76,9 @@ function TourGuide:QUEST_LOG_UPDATE(event) if questturnedin then self:Debug(1, "Detected early chain quest turnin, searching for quest...") - self:CompleteQuest(turninquest) +--~ self:CompleteQuest(turninquest) elseif action == "ACCEPT" then self:UpdateStatusFrame() - elseif action == "TURNIN" and turninquest == quest and not logi then self:SetTurnedIn() +--~ elseif action == "TURNIN" and turninquest == quest and not logi then self:SetTurnedIn() elseif action == "COMPLETE" and complete then self:UpdateStatusFrame() end turninquest = nil end @@ -117,3 +104,13 @@ function TourGuide:UI_INFO_MESSAGE(event, msg) self:SetTurnedIn() end end + + +local orig = GetQuestReward +GetQuestReward = function(...) + local quest = GetTitleText() + TourGuide:Debug(10, "GetQuestReward", quest) + TourGuide:CompleteQuest(quest) + + return orig(...) +end -- 2.11.4.GIT