From dceed1215497bd5e89d42163672badb5bfc3ed5f Mon Sep 17 00:00:00 2001 From: Tekkub Stoutwrithe Date: Wed, 3 Oct 2007 07:32:07 +0000 Subject: [PATCH] TourGuide - More ally guide data! - Possible fix for loot conditional not always working (thanks again to Blizzard's consistent text feedback) - Carto was setting with note, it should have been using objective name git-svn-id: https://tekkub-wow.googlecode.com/svn/trunk/TourGuide@561 86fe6d9a-1522-0410-a387-bf9db416f0a0 --- Alliance/43_45_Feralas.lua | 2 +- Alliance/46_47_Hinterlands.lua | 2 +- Alliance/47_48_Tanaris.lua | 76 +++++++++++++++++++++++++++ Alliance/47_Feralas.lua | 41 +++++++++++++++ James_Alliance/41_42_Stranglethorn.lua | 76 --------------------------- James_Alliance/43_45_Feralas.lua | 95 ---------------------------------- James_Alliance/43_Tanaris.lua | 31 ----------- QuestTracking.lua | 2 +- StatusFrame.lua | 8 +-- TourGuide.lua | 2 +- TourGuide.toc | 2 + 11 files changed, 125 insertions(+), 212 deletions(-) create mode 100644 Alliance/47_48_Tanaris.lua create mode 100644 Alliance/47_Feralas.lua delete mode 100644 James_Alliance/41_42_Stranglethorn.lua delete mode 100644 James_Alliance/43_45_Feralas.lua delete mode 100644 James_Alliance/43_Tanaris.lua diff --git a/Alliance/43_45_Feralas.lua b/Alliance/43_45_Feralas.lua index f6a0ff3..f20a670 100644 --- a/Alliance/43_45_Feralas.lua +++ b/Alliance/43_45_Feralas.lua @@ -45,7 +45,7 @@ A Find OOX-22/FE! |O| |U|8705| C The Mark of Quality |N|Back on mainland, follow the road to the yeti cave (56,56).| T Find OOX-22/FE! |O| |N|At the back of the yeti cave. Don't accept the escort!| C The High Wilderness |N|Shamans are to the south at the temple (59,73). Brutes at Ruins of Isildien (62,54). If you have issues finding warlocks, you should be shot.| -A Freedom for All Creatures |N|Clear around the cage in the camp, then head up the path behind the camp (65,45)| +A Freedom for All Creatures |N|Clear around the cage in the camp, then head up the path behind the camp (65.63,46.76)| C Freedom for All Creatures |N|Escort!| T Freedom for All Creatures A Doling Justice (Part 1) diff --git a/Alliance/46_47_Hinterlands.lua b/Alliance/46_47_Hinterlands.lua index 8d91f41..22d7268 100644 --- a/Alliance/46_47_Hinterlands.lua +++ b/Alliance/46_47_Hinterlands.lua @@ -1,5 +1,5 @@ -TourGuide:RegisterGuide("Hinterlands (46-47)", nil, "Alliance", function() +TourGuide:RegisterGuide("Hinterlands (46-47)", "Feralas (47)", "Alliance", function() return [[ F Stormwind City T In Search of The Temple diff --git a/Alliance/47_48_Tanaris.lua b/Alliance/47_48_Tanaris.lua new file mode 100644 index 0000000..9a079bb --- /dev/null +++ b/Alliance/47_48_Tanaris.lua @@ -0,0 +1,76 @@ + +TourGuide:RegisterGuide("Tanaris (47-48)", nil, "Alliance", function() +return [[ +F Gadgetzan +A The Thirsty Goblin +h Gadgetzan +A The Dunemaul Compound +A Thistleshrub Valley +C Rhapsody's Kalimdor Kocktail |N|Kill Rocs around the big skeletons (49,36), (44,39), (47,45)| +T The Sunken Temple |N|(52,45)| +A The Stone Circle +A Gahz'Ridian + +U Put on the helmet |U|9978| +C The Dunemaul Compound |N|At the ogre camps (40,58) (47,65). Collect stuff for "Gahz'Ridian" anytime it shows up on the minimap.| +C Gahz'Ridian +G Grind on ogres |N|UNtil 10k from 48| + +T Seeing What Happens |O| +A The Stone Watcher |O| +T The Stone Watcher +A Return to Ironforge |O| + +C Thistleshrub Valley |N|To the west (29,66)| +C The Thirsty Goblin + +N If you find Tooga... |N|Accept his quest. He'll follow you, so you can complete "Noxious Lair Investigation" with him on your tail. Just make sure you leave there with at least 10 minutes left on his timer.| +C Noxious Lair Investigation |N|At the Noxious Lair (34,46)| +T Tooga's Quest |O| +A Yuka Screwspigot +T Screecher Spirits |N|Skip the follow-up| + +H Gadgetzan +T The Thirsty Goblin +A In Good Taste +T The Dunemaul Compound +T Thistleshrub Valley +T In Good Taste +A Sprinkle's Secret Ingredient +T Noxious Lair Investigation +A The Schrimshank Redemption +T Gahz'Ridian |N|To the south (52,45)| + +C The Schrimshank Redemption |N|Enter at (55,70), go to the bottom. Take the north entrance, go right three times to the survey gear (55,71)| + +H Gadgetzan |N|Or deathport| +T The Schrimshank Redemption +A Insect Part Analysis (Part 1) +T Insect Part Analysis (Part 1) +A Insect Part Analysis (Part 2) +T Insect Part Analysis (Part 2) +A Rise of the Silithid + +T An Orphan Looking For a Home |N|Up at the raceway in Shimmering Flats| +A A Short Incubation +T A Short Incubation +N The next quest is timed! +A The Newest Member of the Family + +F Ironforge |N|Fly to Theramore, boat to Menethil, fly to IF| +h Ironforge +t Train (Level 48) +T Return to Ironforge |O| |N|In the Hall of Explorers| +A A Future Task +A Passing the Burden +T A Future Task +T Passing the Burden +A Arcane Runes +A An Easy Pickup +T An Easy Pickup |N|In the Military Ward| +A Signal for Pickup +T Signal for Pickup +]] + +end) + diff --git a/Alliance/47_Feralas.lua b/Alliance/47_Feralas.lua new file mode 100644 index 0000000..418002b --- /dev/null +++ b/Alliance/47_Feralas.lua @@ -0,0 +1,41 @@ + +TourGuide:RegisterGuide("Feralas (47)", "Tanaris (47-48)", "Alliance", function() +return [[ +F Feathermoon Stronghold +h Feathermoon Stronghold +T Return to Troyas +A The Stave of Equinex +A The Sunken Temple +A Zapped Giants |N|On the mainland at the dock| +A Fuel for the Zapping + +C Zapped Giants |U|18904| +C Fuel for the Zapping +T Zapped Giants +T Fuel for the Zapping + +A An Orphan Looking For a Home |N|At the grimtotem camp (65.9,45.6), path at (65.63,46.76)| +C Homing Robot OOX-22/FE |N|Back in the yeti cave (56,56)| +N Rhapsody's Kalimdor Kocktail |N|Grind your way to Rage Scar Hold (51,31) killing Ironfur bears and Groddoc apes| |L|6258x3| +N Rhapsody's Kalimdor Kocktail |N|Grind your way to Rage Scar Hold (51,31) killing Groddoc apes| |L|6259x3| +C Improved Quality + +A The Giant Guardian |N|From Rockbiter (42,22)| +C The Stave of Equinex |N|Essences at (38.52,15.79), (40.55,12.64), (39.93,9.46), (37.76,12.15). Use the staff at the monolith (38.8,13.1)| |U|9363| +T The Stave of Equinex +A The Morrow Stone +T The Giant Guardian |N|Back near the last flame (38.22,10.30)| +A Wandering Shay +C Wandering Shay |N|Grab the bell from the chest, use it if she wanders away| |U|9189| +T Wandering Shay + +H Feathermoon Stronghold +T Improved Quality +A Pristine Yeti Hide |O| |U|18969| +T Pristine Yeti Hide |O| +T The Morrow Stone + +]] + +end) + diff --git a/James_Alliance/41_42_Stranglethorn.lua b/James_Alliance/41_42_Stranglethorn.lua deleted file mode 100644 index 4679c18..0000000 --- a/James_Alliance/41_42_Stranglethorn.lua +++ /dev/null @@ -1,76 +0,0 @@ - -TourGuide:RegisterGuide("Jame's - Stranglethorn Vale (41-42)", nil, "Alliance", function() -return [[ -F Stormwind City -A In Search of The Temple |N|In the Dwarven District (63,24)| - -F Booty Bay -h Booty bay -A Goblin Sponsorship |N|From Baron Revilgaz in the Inn (Top Floor)| -A Skullsplitter Tusks |N|From Kebok in the inn (2nd Floor).| -A Tran'Rek |N|From Krazek in the Inn (2nd Floor)| -A Zanzil's Secret |N|From Crank Fizzlebub in the Inn.| -A Akiris by the Bundle (Part 1) |N|From Privateer Bloads next to the Bank.| -A The Bloodsail Buccaneers (Part 1) |N|From First Mate Crazz just past the "Old Port Authority" building (First big building when getting off the Boat).| - -C "Pretty Boy" Duncan |N|Outside, head west right after exiting Booty Bay. He's on the shore (28,69)| -T The Bloodsail Buccaneers (Part 1) |N|On top of one of the barrels| -A The Bloodsail Buccaneers (Part 2) -C Akiris by the Bundle (Part 1) |N|Northwest across the bridge (24,65)| -C Scaring Shaky |N|Head back to the Booty Bay entrance, then follow the path north a bit (31,67)| - -T Scaring Shaky |N|At "Shaky" Philippe on the peer| -A Return to MacKinley -T The Bloodsail Buccaneers (Part 2) |N|At First Mate Crazz a bit further towards the Inn.| -A The Bloodsail Buccaneers (Part 3) -T Akiris by the Bundle (Part 1) |N|At Privateer Bloads next to the bank.| -A Akiris by the Bundle (Part 2) -T "Pretty Boy" Duncan |N|At Catelyn the Blade inside the Inn.| -A The Curse of the Tides -A Up to Snuff |N|From Deeg on the 2nd floor of the Inn.| -T The Bloodsail Buccaneers (Part 3) |N|At Fleet Master Seahorn on the 2nd Floor of the Inn.| -A The Bloodsail Buccaneers (Part 4) -T Return to MacKinley |N|At "Sea Wolf" MacKinley in the house right next to the Inn.| -A Voodoo Dues -A Keep an Eye Out |N|From Dizzy One-Eye near the Booty Bay blacksmith (Left when entering Booty Bay from the tunnel).| - -C The Bloodsail Buccaneers (Part 4) |N|From the Booty Bay exit head east to the coast, then south. Items can be found at the two camps (30,81) (27,83), and in a rowboat (28,83).| -C Keep an Eye Out |N|Kill Bloodsails| -C Up to Snuff |N| Kill Bloodsails| - -C Venture Company Mining |N|From the Booty Bay exit take the road north beyond Gurubashi Arena (39,41). Kill Venture Co. Goblins| -C Raptor Mastery (Part 3) |N|To the northwest across the road (34,37).| -C Panther Mastery (Part 3) |N|Shadowmaw Panther are stealth, but you can find a lot to the northeast (36,35).| - -C Skullsplitter Tusks |N|To the east at Ziata'Jai Ruins (42,36). Clear that camp, then hit Balia'mah Ruins (45,33) to the northeast and then Zul'Mamwe (47,38) to the southeast. Repeat!| -G Level 42 |N|Keep looping through the troll ruins| - -C Goblin Sponsorship (Part 4) |O| |N|Follow the road north to the Venture Co. Base at Lake Nezferiti, go to the oil rig (42,18). Go on top of it, kill Foreman Cozzle, loot his key. Jump down and go to the small house next to the lumber mill, open the chest and get the Fuel Regulator Blueprints.| -C Kurzen's Mystery |N|First scroll is in a tablet named "Moon Over the Vale" in the Bal'lal Ruins (29,20). Second is in a tablet named "Gri"lek the Wanderer", west of Bal'lal Ruins underwater (24,22). Third and Fourth are in the Ruins of Zul'Kunda (21,10). Third is in "Fall of Gurubashi" (23,12). Fourth is in "The Emperor's Tomb" (25,9)| - -T Panther Mastery (Part 3) |N|Back at Nessingwary's Camp (35,10)| -T Raptor Mastery (Part 3) -T Kurzen's Mystery |N|North at the rebel camp| - -H Booty Bay -T Venture Company Mining |N|At Crank Fizzlebub in the Inn.| -T Up to Snuff |N|At Deeg on the 2nd Floor of the Inn.| -T Skullsplitter Tusks |N|At Kebok, 2nd floor of the Inn.| -T Goblin Sponsorship (Part 4) |N|At Baron Revilgaz, 2nd Floor of the Inn.| -A Goblin Sponsorship (Part 5) -T The Bloodsail Buccaneers |N|At Fleet Master Seahorn, 2nd Floor of the Inn.| -T Keep an Eye Out |N|At Dizzy One-Eye to the right of the Blacksmith.| - -C Voodoo Dues |N|Run north to Ruins of Jubuwal (33,51), kill Jon-Jon the Crow and Maury "Club Foot" Wilkins. Run south a tad (33,53) and then east to Ruins of Aboraz (40,57), kill Chucky "Ten Thumbs"| -C Zanzil's Secret |N|Kill the trolls, but avoid Zanzil| - -R Booty Bay -T Zanzil's Secret |N|At Crank Fizzlebub in the inn.| -T Voodoo Dues |N|At "Sea Wolf" MacKinley (First house next to the Inn).| -A Cracking Maury's Foot -A Stoley's Debt - -]] - -end) - diff --git a/James_Alliance/43_45_Feralas.lua b/James_Alliance/43_45_Feralas.lua deleted file mode 100644 index 9ccae0d..0000000 --- a/James_Alliance/43_45_Feralas.lua +++ /dev/null @@ -1,95 +0,0 @@ - -TourGuide:RegisterGuide("Feralas (43-45)", nil, "Alliance", function() -return [[ -F Feathermoon Stronghold - -A The Mark of Quality -A The Ruins of Solarsal -A The Missing Courier (Part 1) -A The High Wilderness -A In Search of Knowledge -T The Missing Courier (Part 1) |N|(31,45)| -A The Missing Courier (Part 2) -f Grab flight point -h Feathermoon Stronghold - -T The Ruins of Solarsal |N|Southwest to the Ruins of Solarsal, at the "Solar Gazebo" (26,52)| -A Return to Feathermoon Stronghold -T Return to Feathermoon Stronghold -A Against the Hatecrest (Part 1) -T Against the Hatecrest (Part 1) -A Against the Hatecrest (Part 2) -C Against the Hatecrest (Part 2) |N|Kill naga back at the ruins| -T Against the Hatecrest (Part 2) -A Against Lord Shalzaru -G Level 44 |N|South thru the ruins, across the water, in a cave (26,67).| -C Against Lord Shalzaru |N|South thru the ruins, across the water, in a cave (26,67). He is level 47, so he might be hard to solo.| - -R Feathermoon Stronghold |N|Or die and rez there| -T Against Lord Shalzaru -A Delivering the Relic -T Delivering the Relic - -C Screecher Spirits |N|Back on the main shore, avoid elementals and giants while killing Rogue Vale Screechers. Use Yeh'Kinya's Bramble on their corpses and talk to the spirits. Work your way south.| |U|10699| -T The Missing Courier (Part 2) |N|Find the boat wreckage (45,64)| -A Boat Wreckage - -T Boat Wreckage |N|Back at the stronghold| -A The Knife Revealed -T The Knife Revealed -A Psychometric Reading -T Psychometric Reading -A The Woodpaw Gnolls - -C The Mark of Quality |N|Back on mainland, follow the road to the yeti cave (56,56).| -A Blah |O| |U|8705| -T Blah |O| |N|At the back of the yeti cave. Don't accept the escort!| -C The High Wilderness |N|Brutes at Ruins of Isildien (61,53). Shamans are to the south at the temple (59,73).| -A Freedom for All Creatures |N|(65,45)| -C Freedom for All Creatures |N|Escort!| -T Freedom for All Creatures -A Doling Justice (Part 1) -C Doling Justice (Part 1) -T Doling Justice (Part 1) -A Doling Justice (Part 2) - -T The Woodpaw Gnolls |N|(73,56)| -A The Writhing Deep -A Thalanaar Delivery |U|11463| -T The Writhing Deep |N|Grind to the hive (73,63). Go inside, take the southern tunnel and stay right. Turnin at the Zukk’Ash Pod| -A Freed from the Hive - -H Feathermoon Stronghold -T The Mark of Quality -A Improved Quality -T The High Wilderness -T Freed from the Hive -A A Hero’s Welcome -T A Hero’s Welcome -A Rise of the Silithid - -F Thalanaar -T Thalanaar Delivery - -F Rut'theran Village |N|Darnassus you dingus| -T Handle With Care -A Favored of Elune? -T In Search of Knowledge -A Feralas: A History |N|From the green book| -T Feralas: A History -A The Borrower - -t Train (Level 44) -T Rise of the Silithid |N|In the temple of the moon, upstairs (39,86)| -T Doling Justice (Part 2) - -B [Elixir of Fortitude] x2 |L|3825 2| -H Feathermoon Stronghold -F Gadgetzan -T The Borrower -A The Super Snapper FX - -]] - -end) - diff --git a/James_Alliance/43_Tanaris.lua b/James_Alliance/43_Tanaris.lua deleted file mode 100644 index 2f1d17c..0000000 --- a/James_Alliance/43_Tanaris.lua +++ /dev/null @@ -1,31 +0,0 @@ - -TourGuide:RegisterGuide("Jame's - Tanaris (43)", "Jame's - Feralas (43-45)", "Alliance", function() -return [[ -F Gadgetzan -T Tran'Rek |N|Don't accept the follow-up| -A Wastewander Justice -A Water Pouch Bounty -A Handle With Care |N|From Curgle Cranklehop| - -R Steamwheedle Port -A WANTED: Caliph Scorpidsting -A Screecher Spirits -T Stoley's Debt -A Stoley's Shipment - -C Wastewander Justice |N| At Noonshade Ruins (61,24) or to the southeast (63,30).| -C WANTED: Caliph Scorpidsting -C Water Pouch Bounty -G Level 43 - -T Water Pouch Bounty -T Wastewander Justice -A More Wastewander Justice -T WANTED: Caliph Scorpidsting - -N Turnin quests in Shimmering flats |N|If you have them.| - -]] - -end) - diff --git a/QuestTracking.lua b/QuestTracking.lua index 51b7c9d..9840744 100644 --- a/QuestTracking.lua +++ b/QuestTracking.lua @@ -56,7 +56,7 @@ end function TourGuide:CHAT_MSG_LOOT(event, msg) local action, quest, _, _, _, _, _, _, _, _, lootitem, lootqty = self:GetCurrentObjectiveInfo() - local _, _, itemid, name = msg:find("^You receive .*Hitem:(%d+).*(%[.+%])") + local _, _, itemid, name = msg:find("^You .*Hitem:(%d+).*(%[.+%])") self:Debug(10, event, msg:gsub("|","||"), action, quest, lootitem, lootqty, itemid, name) if action == "BUY" and name and name == quest diff --git a/StatusFrame.lua b/StatusFrame.lua index c9d4a79..a72bc44 100644 --- a/StatusFrame.lua +++ b/StatusFrame.lua @@ -159,12 +159,8 @@ function TourGuide:UpdateStatusFrame() if note and (TomTom or Cartographer_Waypoints) and not mapped[action..quest] then mapped[action..quest] = true for x,y in note:gmatch("%(([%d.]+),([%d.]+)%)") do - if (TomTom) then - TomTom:AddWaypoint(tonumber(x), tonumber(y), quest) - elseif (Cartographer_Waypoints) then - Cartographer_Waypoints:AddLHWaypoint(nil, nil, tonumber(x), tonumber(y), note) - end - + if TomTom then TomTom:AddWaypoint(tonumber(x), tonumber(y), quest) + elseif Cartographer_Waypoints then Cartographer_Waypoints:AddLHWaypoint(nil, nil, tonumber(x), tonumber(y), quest) end end end diff --git a/TourGuide.lua b/TourGuide.lua index 72c32c6..13cb3f0 100644 --- a/TourGuide.lua +++ b/TourGuide.lua @@ -156,7 +156,7 @@ end local myclass = UnitClass("player") -local titlematches = {"For", "A", "The", "Or", "In", "Then", "From", "To"} +local titlematches = {"For", "A", "The", "Or", "In", "Then", "From", "To", "A"} local function ParseQuests(...) local accepts, turnins, completes = {}, {}, {} local uniqueid = 1 diff --git a/TourGuide.toc b/TourGuide.toc index 1886b66..6584b40 100644 --- a/TourGuide.toc +++ b/TourGuide.toc @@ -62,6 +62,8 @@ Alliance\41_42_Stranglethorn.lua Alliance\43_Tanaris.lua Alliance\43_45_Feralas.lua Alliance\46_47_Hinterlands.lua +Alliance\47_Feralas.lua +Alliance\47_48_Tanaris.lua Alliance\66_67_BladesEdge.lua Alliance\67_70_Netherstorm.lua -- 2.11.4.GIT