Merge branch 'master' into LightHeadedNPCMapping

ObjectivesFrame.lua

@@ -57,6 +57,14 @@ local function ShowTooltip(f)
 end
 
 
+local function ShowTooltip2(f)
+	if not f.qid then return end
+
+	GameTooltip:SetOwner(f, "ANCHOR_RIGHT")
+	GameTooltip:SetHyperlink("quest:"..f.qid)
+end
+
+
 local function CreateButton(parent, ...)
 	local b = CreateFrame("Button", nil, parent)
 	if select("#", ...) > 0 then b:SetPoint(...) end
@@ -130,6 +138,11 @@ function TourGuide:CreateObjectivePanel()
 		local icon = ww.SummonTexture(row, nil, ROWHEIGHT-ROWOFFSET, ROWHEIGHT-ROWOFFSET, nil, "LEFT", check, "RIGHT", ROWOFFSET, 0)
 		local text = ww.SummonFontString(row, nil, "GameFontNormal", nil, "LEFT", icon, "RIGHT", ROWOFFSET, 0)
 
+		local questhover = CreateFrame("Button", nil, row)
+		questhover:SetAllPoints(text)
+		questhover:SetScript("OnEnter", ShowTooltip2)
+		questhover:SetScript("OnLeave", HideTooltip)
+
 		local detailhover = CreateFrame("Button", nil, row)
 		detailhover:SetHeight(ROWHEIGHT-ROWOFFSET)
 		detailhover:SetPoint("LEFT", text, "RIGHT", ROWOFFSET*3, 0)
@@ -146,6 +159,7 @@ function TourGuide:CreateObjectivePanel()
 		check:SetScript("OnClick", function(f) self:SetTurnedIn(row.i, f:GetChecked()) end)
 
 		row.text = text
+		row.questhover = questhover
 		row.detail = detail
 		row.check = check
 		row.icon = icon
@@ -209,6 +223,7 @@ function TourGuide:UpdateOHPanel(value)
 			row.text:SetText(name..(optional and " |cff808080(Optional)" or ""))
 			row.detail:SetText(self:GetObjectiveTag("N", i + offset))
 			row.check:SetChecked(checked)
+			row.questhover.qid = self:GetObjectiveTag("QID", i + offset)
 
 			if (TourGuide.current > (i + offset)) and optional and not checked then
 				row.text:SetTextColor(0.5, 0.5, 0.5)

TourGuide_Alliance/52_53_Azshara.lua

@@ -0,0 +1,69 @@
+
+TourGuide:RegisterGuide("Azshara (52-53)", "Felwood (53-54)", "Alliance", function()
+return [[
+A Cenarion Aid |QID|8254| |C|Priest|
+
+A A Simple Request |QID|8233| |C|Rogue|
+T A Simple Request |QID|8233| |C|Rogue|
+A Sealed Azure Bag |QID|8234| |C|Rogue|
+
+F Azshara |N|Fly to Forest Song or Astranaar and run east if you don't have the FP|
+
+A Spiritual Unrest |QID|5535|
+A A Land Filled with Hatred |QID|5536|
+C Spiritual Unrest |QID|5535| |N|Kill ghosts to the north at Shadowsong Shrine (14,72)|
+C A Land Filled with Hatred |QID|5536| |N|Further north at the Haldarr Encampment (19,61)|
+T Spiritual Unrest |QID|5535|
+T A Land Filled with Hatred |QID|5536|
+
+T Meeting with the Master |QID|3503| |C|Mage|
+A Magic Dust |QID|8251| |C|Mage|
+
+N Get Beth'Amara Rubbing |N|In the Ruins of Eldarath (36.86, 53.20)| |L|10563|
+N Get Markri Rubbing |N|In the Temple of Zin-Malor (39.28, 55.51)| |L|10565|
+N Get Jin'yael Rubbing |N|In the Temple of Zin-Malor (39.55, 50.09)| |L|10564|
+
+T The Hunter's Charm |QID|8151| |C|Hunter|
+A Courser Antlers |QID|8153| |C|Hunter|
+
+T Cenarion Aid |QID|8254| |C|Priest|
+A Of Coursers We Know |QID|8255| |C|Priest|
+
+C Sealed Azure Bag |QID|8234| |C|Rogue| |N|Can be pickpocketed from Timbermaw Shaman (45,25).  If you are Unfriendly or better with them, you will have to check 'At War' in their reputation panel.|
+
+A Kim'jael Indeed! |QID|3601| |N|On top of a hill near the satyr camp to the north (53.4, 21.8)|
+C Kim'jael Indeed! |QID|3601| |N|To the south at the Thallasian Base Camp (56,29) (57,28) (60,31) (59,28).  Loot the crates till you find all his stuff.|
+C Magic Dust |QID|8251| |C|Mage| |N|Kill them blood elves!|
+T Kim'jael Indeed! |QID|3601|
+A Kim'jael's "Missing" Equipment |QID|5534|
+
+T Meeting with the Master |QID|3503| |C|Mage|
+T Sealed Azure Bag |QID|8234| |C|Rogue|
+A Encoded Fragments |QID|8235| |C|Rogue|
+
+T Magic Dust |C|Mage| |QID|8251|
+A The Siren's Coral |QID|8252| |C|Mage|
+
+C Courser Antlers |QID|8153| |C|Hunter|
+T Courser Antlers |QID|8153| |C|Hunter|
+A Wavethrashing |QID|8231| |C|Hunter|
+C Wavethrashing |QID|8231| |C|Hunter| |N|Down in the water, of course (87,26)| |C|Hunter|
+T Wavethrashing |QID|8231| |C|Hunter| |N|Skip the follow-up if you don't plan on doing Sunken Temple|
+
+C Of Coursers We Know |QID|8255| |C|Priest|
+T Of Coursers We Know |QID|8255| |C|Priest|
+A The Ichor of Undeath |QID|8256| |C|Priest|
+T The Ichor of Undeath |QID|8256| |C|Priest| |N|Skip the follow-up if you don't plan on doing Sunken Temple|
+
+C Kim'jael's "Missing" Equipment |QID|5534| |N|Kill naga in the ruins (37,52)|
+C The Siren's Coral |QID|8252| |C|Mage| |N|The Enchanted Coral only drops from the Sirens|
+
+T Kim'jael's "Missing" Equipment |QID|5534|
+T The Siren's Coral |QID|8252| |C|Mage| |N|Skip the follow-up if you don't plan on doing Sunken Temple|
+T Encoded Fragments |QID|8235| |C|Rogue| |N|Skip the follow-up if you don't plan on doing Sunken Temple|
+
+C Arcane Runes |QID|3449| |N|Get Sael'hai Rubbing (42.32, 64.22)|
+T Arcane Runes |QID|3449| |N|Use your flare gun at the helipad in the far southeastern edge of the zone (77.85, 91.38)|
+A Return to Tymor
+]]
+end)

TourGuide_Alliance/54_55_Winterspring.lua

@@ -13,7 +13,7 @@ A Threat of the Winterfall |QID|5082|
 R Everlook |N|Follow the road east|
 A Enraged Wildkin (Part 1) |QID|6604|
 h Everlook
-A The Everlook Report |QID|6029|
+A The Everlook Report |QID|6028|
 A Duke Nicholas Zverenhoff |QID|6030|
 A Sister Pamela |QID|5601|
 A Are We There, Yeti? (Part 1) |QID|3783|
@@ -49,8 +49,7 @@ T Winterfall Activity |N|Back up at the entrance to Timbermaw Hold| |QID|8464|
 R Felwood
 T Falling to Corruption |N|Talk to the cauldren in the Deadwood furbolg camp (60.2, 5.9)| |Z|Felwood| |QID|5084|
 A Mystery Goo |QID|5085|
-A Deadwood Ritual Totem |NODEBUG| |O| |U|20741| |QID|8470|
-T Deadwood Ritual Totem |NODEBUG| |O| |N|Turn-in at a furblog halfway thru the hold| |QID|8470|
+T Mystery Goo |N|Back in Winterspring, of course.|
 
 F Darnassus
 T Moontouched Wildkin |QID|978|

TourGuide_Alliance/56_57_Western_Plaguelands.lua

@@ -11,19 +11,19 @@ A A Plague Upon Thee (Part 1) |QID|5903|
 A The Mark of the Lightbringer |N|From Anchorite Truuen.  He may not be in the camp if he's out doing the escort quest.| |QID|9474|
 T A Call to Arms: The Plaguelands! |QID|10374|
 A Clear the Way |QID|5092|
-T The Everlook Report |QID|6029|
+T The Everlook Report |QID|6028|
 N Get a Commission |N|Talk to the quartermaster and get a commission, you should have this equipped any time you are in the plaguelands.  Turn in any scourgestones you get when you are in town if you have a full stack.| |L|12846|
 
 C Clear the Way |N|To the northeast at Sorrow Hill| |QID|5092|
 T Clear the Way |QID|5092|
 A All Along the Watchtowers |QID|5098|
-A The Scourge Cauldrons |QID|5228|
-T The Scourge Cauldrons |QID|5228|
-A Target: Felstone Field |QID|5229|
+A The Scourge Cauldrons |QID|5215|
+T The Scourge Cauldrons |QID|5215|
+A Target: Felstone Field |QID|5216|
 
 C All Along the Watchtowers |U|12815| |N|Mark each tower in Andorhal, you can get close enough to mark without aggroing mobs inside if you are careful. (47,71) (40,71) (42,66) (44,63)| |QID|5098|
-C Target: Felstone Field |N|To the northwest at Felstone Field (37,56).  Kill Cauldron Lord Bilemaw for the key, then talk to the cauldren.| |QID|5229|
-T Target: Felstone Field |N|Talk to the cauldren| |QID|5229|
+C Target: Felstone Field |N|To the northwest at Felstone Field (37,56).  Kill Cauldron Lord Bilemaw for the key, then talk to the cauldren.| |QID|5216|
+T Target: Felstone Field |N|Talk to the cauldren| |QID|5216|
 A Return to Chillwind Camp (Part 1) |QID|5217|
 
 A Better Late Than Never (Part 1) |N|In the house on the northeast side of the field (38,54), upstairs| |QID|5021|
@@ -35,10 +35,10 @@ A Scholomance |QID|5533|
 T Scholomance |QID|5533|
 A Skeletal Fragments |QID|5537|
 T Return to Chillwind Camp (Part 1) |QID|5217|
-A Target: Dalson's Tears |QID|5231|
+A Target: Dalson's Tears |QID|5219|
 
-C Target: Dalson's Tears |N|To the north at Dalson's Tears (46,52).  Kill Cauldron Lord Malvinious for the key, then talk to the cauldren.| |QID|5231|
-T Target: Dalson's Tears |N|Talk to the cauldren| |QID|5231|
+C Target: Dalson's Tears |N|To the north at Dalson's Tears (46,52).  Kill Cauldron Lord Malvinious for the key, then talk to the cauldren.| |QID|5219|
+T Target: Dalson's Tears |N|Talk to the cauldren| |QID|5219|
 A Return to Chillwind Camp (Part 2) |QID|5220|
 
 N Read Mrs. Dalson's Diary |N|On the floor in the barn (47.8, 50.7).  Nothing to accept, just read the book.|

TourGuide_Alliance/57_58_Eastern_Plaguelands.lua

@@ -16,7 +16,7 @@ T Pamela's Doll |QID|5149|
 A Auntie Marlene |QID|5152|
 A Uncle Carlin |QID|5241|
 
-K Plaguehounds |Q|Demon Dogs| |QO|Plaguehound Runt slain: 20/20| |N|All over the southwestern section of the zone|
+K Plaguehound Runts |Q|Demon Dogs| |QO|Plaguehound Runt slain: 20/20| |N|All over the southwestern section of the zone|
 C Blood Tinged Skies |QID|5543|
 
 T Uncle Carlin |N|East at Light's Hope Chapel (81,58)| |QID|5241|

TourGuide_Alliance/Guides.xml

@@ -38,6 +38,7 @@
 	<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_55_Winterspring.lua"/>
 	<Script file="55_56_Burning_Steppes.lua"/>

TourGuide_Horde/20_Barrens.lua

@@ -17,7 +17,7 @@ F Camp Taurajo
 A Melor Sends Word |T| |QID|1130|
 A Tribes at War |T| |QID|878|
 C Lost in Battle |N|In a hut off the road north of Camp Taurajo (49.31, 50.34)| |QID|4921|
-C Consumed by Hatred |N|To the southeast| |QID|899|
+C Consumed by Hatred |N|Southeast of Mankirk's wife, northeast of Camp Taurajo| |QID|899|
 C Tribes at War |QID|878|
 
 T Tribes at War |N|Back at Camp Taurajo| |T| |QID|878|

TourGuide_Horde/23_25_Stonetalon_Mountains.lua

@@ -6,10 +6,10 @@ T Boulderslide Ravine |N|Skip the follow-up| |T| |QID|6421|
 A Elemental War |T| |QID|6393|
 A Harpies Threaten |T| |QID|6282|
 h Sun Rock Retreat |T|
-A Cycle of Rebirth |N|Pick up seeds around (48,41)| |QID|6301|
-C Cycle of Rebirth |QID|6301|
-C Cenarius' Legacy |N|Done around (35,14)| |QID|1087|
-C Jin'Zil's Forest Magic |N|Mobs around (45,27)| |QID|1058|
+A Cycle of Rebirth |QID|6301|
+C Cycle of Rebirth |N|Pick up seeds around Mirkfallon Lake (48,41)| |QID|6301|
+C Jin'Zil's Forest Magic |N|Mobs range from the north side of Mirkfallon Lake up to Stonetalon Peak.| |QID|1058|
+C Cenarius' Legacy |N|In the center of Stonetalon Peak.| |QID|1087|
 T Cycle of Rebirth |QID|6301|
 A New Life |QID|6381|
 T Cenarius' Legacy |QID|1087|
@@ -20,8 +20,8 @@ A Gerenzo Wrenchwhistle |QID|1096|
 C Gerenzo Wrenchwhistle |N|At (64,41)| |QID|1096|
 C Shredding Machines |QID|1068|
 T Gerenzo Wrenchwhistle |QID|1096|
-T Jin'Zil's Forest Magic |N|Turn in at (74,97)| |QID|1058|
-T Shredding Machines |N|Turn in at near Barrens (35,27)| |QID|1068|
+T Jin'Zil's Forest Magic |QID|1058|
+T Shredding Machines |QID|1068|
 
 H Sun Rock Retreat
 C New Life |N|West in the Charred Vale (32,67)| |QID|6381|

TourGuide_Horde/31_32_ThousandNeedles.lua

@@ -8,7 +8,6 @@ A The Kolkar of Desolace |N|West of Crossroads in the bunkers (45.3, 28.4)| |Z|T
 
 R Shimmering Flats |N|Run back to Crossroads and fly down to Thousand Needles|
 A Hemet Nesingwary Jr. |N|From Kravel Koalbeard (77.8, 77.2)| |QID|5762|
-A Delivery to the Gnomes (Part 1)
 A Wharfmaster Dizzywig |QID|1492|
 A A Bump in the Road |QID|1175|
 A Hardened Shells |QID|1105|

TourGuide_Horde/37_Thousand_Needles.lua

@@ -14,11 +14,11 @@ A The Swarm Grows (Part 3)
 P Bite (Rank 5) |N|Tame a turtle in Shimmering Flats and feed him those mushrooms you bought.| |C|Hunter|
 N Keep the turtle |C|Hunter|
 
-T Delivery to the Gnomes (Part 1) |N|At the Mirage Raceway (77,76)|
+T Parts for Kravel |QID|1112| |N|At the Mirage Raceway (77.8, 77.2)|
+A Delivery to the Gnomes (Part 1)
+T Delivery to the Gnomes (Part 1)
 A Delivery to the Gnomes (Part 2)
 T Delivery to the Gnomes (Part 2)
-
-T Parts for Kravel |QID|1112|
 T Goblin Sponsorship (Part 5)
 
 A The Eighteenth Pilot |QID|1186|

TourGuide_Horde/44_45_Tanaris.lua

@@ -1,7 +1,7 @@
 TourGuide:RegisterGuide("Tanaris (44-45)", "Feralas (45-46)", "Horde", function()
 return [[
 F Gadgetzan
-A WANTED: Caliph Scorpidsting |N|Wanted poster in front of the cage (0,0)|T| |QID|2781|
+A WANTED: Caliph Scorpidsting |N|Wanted poster in front of the cage| |T| |QID|2781|
 A WANTED: Andre Firebeard |T| |QID|2875|
 T Tran'rek |T| |QID|2864|
 A Gadgetzan Water Survey |N|Southwest side of town on a hill (50.2,27.5)| |T| |QID|992|
@@ -33,12 +33,13 @@ A Southsea Shakedown |QID|8366|
 T Stoley's Debt |QID|2872|
 A Stoley's Shipment |QID|2873|
 
-C Wastewander Justice |N|At (64,29)| |QID|1690|
 C Water Pouch Bounty |QID|1878|
-C Southsea Shakedown |N|Down at Lost Rigger Cove (72,47)| |QID|8366|
+C Wastewander Justice |N|At (64,29)| |QID|1690|
+
+C WANTED: Andre Firebeard |N|At Lost Rigger Cove (73.4,47.1)| |QID|2875|
+C Stoley's Shipment |N|Upstairs in the northern building (72.1,46.7)| |QID|2873|
 C Pirate Hats Ahoy! |QID|8365|
-C Stoley's Shipment |QID|2873|
-C WANTED: Andre Firebeard |QID|2875|
+C Southsea Shakedown |QID|8366|
 
 H Gadgetzan
 T Water Pouch Bounty |QID|1878|
@@ -47,12 +48,13 @@ A More Wastewander Justice |QID|1691|
 C Gadgetzan Water Survey |N|Grind mobs along the way, at (38,29)| |QID|992|
 T Gadgetzan Water Survey |QID|992|
 
-T Pirate Hats Ahoy |N|Back at Steamwheedle Port|
+T Pirate Hats Ahoy! |N|Back at Steamwheedle Port|
 T Stoley's Shipment |QID|2873|
 T Southsea Shakedown |QID|8366|
 A Deliver to MacKinley |QID|2874|
+T WANTED: Andre Firebeard |QID|2875|
 A Ship Schedules |U|9250| |O| |QID|2876|
-T Ship Schedules |O| |N|Back at Steamwheedle Port| |QID|2876|
+T Ship Schedules |O| |QID|2876|
 
 C More Wastewander Justice |N|At (59,37)| |QID|1691|
 C WANTED: Caliph Scorpidsting |N|At (59,37)| |QID|2781|