Merge branch 'master' into AllyQIDs

Conflicts:

	TourGuide_Alliance/51_52_UnGoro_Crater.lua
	TourGuide_Alliance/52_53_Azshara.lua
	TourGuide_Alliance/54_Ungoro_Crater.lua

Parser.lua

@@ -26,6 +26,7 @@ function TourGuide:GetObjectiveTag(tag, i)
 
 	if tag == "O" then return tags:find("|O|")
 	elseif tag == "T" then return tags:find("|T|")
+	elseif tag == "QID" then return tonumber((tags:match("|QID|(%d+)|")))
 	elseif tag == "L" then
 		local _, _, lootitem, lootqty = tags:find("|L|(%d+)%s?(%d*)|")
 		lootqty = tonumber(lootqty) or 1

QuestIDTracking.lua

@@ -7,7 +7,8 @@ local L = TourGuide.Locale
 local hadquest
 
 
-local completedquests, currentquests, oldquests, titles, firstscan, abandoning = {}, {}, {}, {}, true
+local turnedinquests, currentquests, oldquests, titles, firstscan, abandoning = {}, {}, {}, {}, true
+TourGuide.turnedinquests = turnedinquests
 local qids = setmetatable({}, {
 	__index = function(t,i)
 		local v = tonumber(i:match("|Hquest:(%d+):"))
@@ -30,7 +31,7 @@ function TourGuide:QuestID_QUEST_LOG_UPDATE()
 	end
 
 	if firstscan then
-		local function helper(...) for i=1,select("#", ...) do completedquests[select(i, ...)] = true end end
+		local function helper(...) for i=1,select("#", ...) do turnedinquests[select(i, ...)] = true end end
 		helper(string.split(",", TourGuideQuestHistoryDB or ""))
 		firstscan = nil
 		return
@@ -39,7 +40,7 @@ function TourGuide:QuestID_QUEST_LOG_UPDATE()
 	for qid in pairs(oldquests) do
 		if not currentquests[qid] then
 			local action = abandoning and "Abandoned quest" or "Completed quest"
-			if not abandoning then completedquests[qid] = true end
+			if not abandoning then turnedinquests[qid] = true end
 			abandoning = nil
 			self:Debug(1, action, qid, titles[qid])
 			-- Callback
@@ -57,7 +58,7 @@ end
 
 function TourGuide:Disable()
 	local temp = {}
-	for i in pairs(completedquests) do table.insert(temp, i) end
+	for i in pairs(turnedinquests) do table.insert(temp, i) end
 	TourGuideQuestHistoryDB = string.join(",", unpack(temp))
 end
 

QuestTracking.lua

@@ -6,24 +6,7 @@ local hadquest
 
 
 TourGuide.TrackEvents = {"UI_INFO_MESSAGE", "CHAT_MSG_LOOT", "CHAT_MSG_SYSTEM", "QUEST_WATCH_UPDATE", "QUEST_LOG_UPDATE", "ZONE_CHANGED", "ZONE_CHANGED_INDOORS",
-	"MINIMAP_ZONE_CHANGED", "ZONE_CHANGED_NEW_AREA", "PLAYER_LEVEL_UP", "ADDON_LOADED", "CRAFT_SHOW"}
-
-
-function TourGuide:ADDON_LOADED(event, addon)
-	if addon ~= "Blizzard_TrainerUI" then return end
-
-	self:UnregisterEvent("ADDON_LOADED")
-
-	local f = CreateFrame("Frame", nil, ClassTrainerFrame)
-	f:SetScript("OnShow", function() if self:GetObjectiveInfo() == "TRAIN" then self:SetTurnedIn() end end)
-end
-
-
-function TourGuide:PLAYER_LEVEL_UP(event, newlevel)
-	local level = tonumber((self:GetObjectiveTag("LV")))
-	self:Debug(1, "PLAYER_LEVEL_UP", newlevel, level)
-	if level and newlevel >= level then self:SetTurnedIn() end
-end
+	"MINIMAP_ZONE_CHANGED", "ZONE_CHANGED_NEW_AREA", "CRAFT_SHOW"}
 
 
 function TourGuide:ZONE_CHANGED(...)

TourGuide.lua

@@ -124,7 +124,9 @@ function TourGuide:GetObjectiveStatus(i)
 	i = i or self.current
 	if not self.actions[i] then return end
 
-	return self.turnedin[self.quests[i]], self:GetQuestDetails(self.quests[i]) -- turnedin, logi, complete
+	local qid = self:GetObjectiveTag("QID", i)
+
+	return qid and self.turnedinquests[qid] or self.turnedin[self.quests[i]], self:GetQuestDetails(self.quests[i]) -- turnedin, logi, complete
 end
 
 
@@ -136,14 +138,16 @@ function TourGuide:SetTurnedIn(i, value, noupdate)
 
 	if value then value = true else value = nil end -- Cleanup to minimize savedvar data
 
+	local qid = self:GetObjectiveTag("QID", i)
+	if qid then self.turnedinquests[qid] = value end
 	self.turnedin[self.quests[i]] = value
 	self:DebugF(1, "Set turned in %q = %s", self.quests[i], tostring(value))
 	if not noupdate then self:UpdateStatusFrame()
 	else self.updatedelay = i end
 end
 
 
-function TourGuide:CompleteQuest(name, noupdate)
+function TourGuide:CompleteQuest(name)
 	if not self.current then
 		self:DebugF(1, "Cannot complete %q, no guide loaded", name)
 		return
@@ -155,7 +159,7 @@ function TourGuide:CompleteQuest(name, noupdate)
 		action, quest = self:GetObjectiveInfo(i)
 		if action == "TURNIN" and not self:GetObjectiveStatus(i) and name == quest:gsub(L.PART_GSUB, "") then
 			self:DebugF(1, "Saving quest turnin %q", quest)
-			return self:SetTurnedIn(i, true, noupdate)
+			return self:SetTurnedIn(i, true, true)
 		end
 		i = i + 1
 	until not action

TourGuide_Alliance/47_48_Tanaris.lua

@@ -55,13 +55,6 @@ T Akiris by the Bundle |QID|623|
 
 F City of Ironforge |N|Boat to Menethil, fly to IF|
 h City of Ironforge
-A Passing the Burden |N|In the Hall of Explorers| |QID|3448|
-T Passing the Burden |N|In the Mystic Ward (31.20, 4.70)| |Z|Ironforge| |QID|3448|
-A Arcane Runes |QID|3449|
-A An Easy Pickup |QID|3450|
-T An Easy Pickup |N|In the Military Ward (71.04, 94.34)| |Z|Ironforge| |QID|3450|
-A Signal for Pickup |QID|3483|
-T Signal for Pickup |QID|3483|
 
 F Aerie Peak |N|Hinterlands!|
 T The Newest Member of the Family |N|In the inn, downstairs| |QID|3843|

TourGuide_Alliance/50_51_Searing_Gorge.lua

@@ -2,7 +2,6 @@
 TourGuide:RegisterGuide("Searing Gorge (50-51)", "Kalimdor (51)", "Alliance", function()
 return [[
 F City of Ironforge
-A The Hunter's Charm |C|Hunter| |QID|8151|
 h City of Ironforge
 A Assisting Arch Druid Staghelm |N|From the innkeeper| |QID|10520|
 B 15 Silk Cloth |L|4306 15| |N|If you don't already have them, that is|

TourGuide_Alliance/51_52_UnGoro_Crater.lua

@@ -33,6 +33,7 @@ A Roll the Bones |QID|3882|
 A Alien Ecology |QID|3883|
 T Williden's Journal |QID|3884|
 A Expedition Salvation |QID|3881|
+C It's a Secret to Everybody (Part 2) |N|Open "A Small Pack"| |U|11107| |QID|???|
 T It's a Secret to Everybody (Part 2) |QID|???|
 A It's a Secret to Everybody (Part 3) |QID|???|
 f Get flight point |N|Up on the hill, easy to miss|
@@ -51,21 +52,23 @@ C Super Sticky |N|At the tarpits in the north half of the zone| |QID|4504|
 N Find [Crate of Foodstuffs] |N|At the abandoned camp in the east side of the zone (68.52, 36.59)| |L|11113|
 C Muigin and Larion |N|Kill lasher around the camp area.  Also kill any diemetradons or pterrordaxes you come across| |QID|4141|
 C The Eastern Pylon |N|To the east, of course (76,51)| |QID|4287|
-C The Bait for Lar'korwi |N|Use the meat and mixture at the flat rock behind the east pylon (79.9, 49.9)| |U|11568| |QID|4292|
-T The Bait for Lar'korwi |QID|4292|
+U Open Torwa's Pouch |U|11568|
+U Place the meat |U|11569| |N|At the flat rock behind the east pylon (79.9, 49.9)|
+C The Bait for Lar'korwi |U|11570| |QID|4292| |N|Use the pheromone mixture, kill him!|
 T The Apes of Un'Goro |N|Skip the follow-up| |QID|4289|
+T The Bait for Lar'korwi |QID|4292|
 
 C Alien Ecology |N|Down in the Slithering Scar (50,77).  Head left inside to the big room (48.62, 85.33), use the vial| |U|11132| |QID|3883|
-N Kill bugs for [Gorishi Scent Gland] |L|11837|
-C Expedition Salvation |N|At the other camp (38.5, 66.0)| |QID|3881|
-C The Western Pylon |N|(23,59)| |QID|4288|
+C Bungle in the Jungle
+C Expedition Salvation |N|At camp to the west (38.5, 66.0).  Beware of the elite Stegodons.| |QID|3881|
+C The Western Pylon |N|Up the hill, west of the camp (23.8, 59.1)| |QID|4288|
 A Finding the Source |N|From a goblin near the hot springs (30.9, 50.4)| |QID|974|
 
-C Roll the Bones |N|Scattered all over the west half of the zone and drop from diemetradons.  Kill pterrordaxes over here too.| |QID|3882|
+C Roll the Bones |N|Scattered all over the west half of the zone and drop from diemetradons.  Kill pterrordaxes over here too.  There is usually a good stash of bones at a threshadorn carcass to the southwest of the camp (31.27, 77.43).| |QID|3882|
 C Beware of Pterrordax |N|You can find the Frenzied Pterrordaxes all over the west half of the zone, more towards the northwest part.  Normal Pterrordaxes are in the south half of the zone, and a few near the North pylon.| |QID|4501|
 C Shizzle's Flyer |N|Kill diemetradons and pterrordaxes, all over the zone.| |QID|4503|
 
-C Finding the Source |N|At the volcano in the center of the zone.  Use the thermometer at "Hot Spots" until you complete the quest.| |U|12472| |QID|974|
+C Finding the Source |N|At the volcano in the center of the zone.  Use the thermometer at the "Hot Spot" at the top of the mountain (49.75, 45.78).| |U|12472| |QID|974|
 C Volcanic Activity |N|Kill elementals, mainly around the cave on the south side of the volcano.| |QID|4502|
 T Lost! |N|In the cave on the south side of the volcano (51,49)| |QID|4492|
 A A Little Help From My Friends |NODEBUG| |QID|4491|
@@ -88,18 +91,22 @@ A The New Springs |QID|980|
 
 R Silithus |N|Take the path up out of the crater in the northwest corner of the zone (29,22)|
 R Cenarion Hold |N|Follow the road|
-F Gadgetzan |N|FP is up the big hill|
+F Gadgetzan |N|Flightpoint is up the big hill|
 T Bungle in the Jungle |N|Skip the follow-up| |QID|4496|
 T Super Sticky |QID|4504|
 
 H Darnassus
+<<<<<<< HEAD:TourGuide_Alliance/51_52_UnGoro_Crater.lua
 T Un'Goro Soil |QID|3764|
 A Morrowgrain Research (Part 1) |N|Upstairs!| |QID|???|
 T Morrowgrain Research (Part 1) |N|Downstairs!| |QID|???|
 A Morrowgrain Research (Part 2) |QID|???|
+=======
+T Un'Goro Soil |N|Behind the druids' treehouse.| |QID|3764|
+A Morrowgrain Research (Part 1) |N|Upstairs!|
+T Morrowgrain Research (Part 1) |N|Downstairs!|
+A Morrowgrain Research (Part 2)
+>>>>>>> master:TourGuide_Alliance/51_52_UnGoro_Crater.lua
 N Morrowgrain... |N|Use the Evergreen Pouch whenever it's cooldown is up until you get all your Morrowgrain.|
-B Ichor of Undeath |L|7972| |C|Priest|
-
-A Moontouched Wildkin |N|Down in Rut'theran Village| |QID|978|
 ]]
 end)

TourGuide_Alliance/53_54_Felwood.lua

@@ -1,6 +1,10 @@
 
 TourGuide:RegisterGuide("Felwood (53-54)", "Un'Goro Crater (54)", "Alliance", function()
 return [[
+H Darnassus
+T Morrowgrain Research (Part 2) |N|Save 10 soil and 15 Morrowgrain for later|
+A Moontouched Wildkin |N|Down in Rut'theran Village| |QID|978|
+
 F Astranaar
 h Astranaar
 

TourGuide_Alliance/54_Ungoro_Crater.lua

@@ -4,7 +4,6 @@ return [[
 F City of Ironforge
 T A Little Slime Goes a Long Way (Part 1) |N|In the Hall of Explorers| |QID|???|
 A A Little Slime Goes a Long Way (Part 2) |QID|???|
-T Return to Tymor |N|In the Mystic Ward| |QID|3461|
 
 F Gadgetzan
 T Meet at the Grave |N|Go to the graveyard east of town, drink the elixir.  DO NOT REZ.  Run north to Gaeriyan (54.0, 23.4)| |U|11243| |Z|Tanaris| |QID|3912|

TourGuide_Alliance/Guides.xml

@@ -38,7 +38,6 @@
 	<Script file="50_51_Searing_Gorge.lua"/>
 	<Script file="51_Kalimdor.lua"/>
 	<Script file="51_52_UnGoro_Crater.lua"/>
-	<Script file="52_53_Azshara.lua"/>
 	<Script file="53_54_Felwood.lua"/>
 	<Script file="54_Ungoro_Crater.lua"/>
 	<Script file="54_Felwood.lua"/>