@@ -45,8 +45,6 @@ function TourGuide:UpdateStatusFrame() end end - if action == "PET" and self.db.char.petskills[name] then return self:SetTurnedIn(i, true) end - local incomplete if action == "ACCEPT" then incomplete = (not optional or hasuseitem or haslootitem or prereqturnedin) and not logi elseif action == "TURNIN" then incomplete = not optional or logi Broker.lua @@ -14,7 +14,6 @@ local actiontypes = { B = "BUY", b = "BOAT", U = "USE", - P = "PET", } Parser.lua @@ -6,7 +6,7 @@ local hadquest TourGuide.TrackEvents = {"UI_INFO_MESSAGE", "CHAT_MSG_LOOT", "CHAT_MSG_SYSTEM", "QUEST_LOG_UPDATE", "ZONE_CHANGED", "ZONE_CHANGED_INDOORS", - "MINIMAP_ZONE_CHANGED", "ZONE_CHANGED_NEW_AREA", "CRAFT_SHOW"} + "MINIMAP_ZONE_CHANGED", "ZONE_CHANGED_NEW_AREA"} function TourGuide:ZONE_CHANGED(...) @@ -38,16 +38,6 @@ function TourGuide:CHAT_MSG_SYSTEM(event, msg) return self:UpdateStatusFrame() end end - - if action == "PET" then - local _, _, text = msg:find(L["You have learned a new spell: (.*)."]) - local nextEntry = #TourGuide.petskills + 1 - TourGuide.petskills[nextEntry] = text - if text and quest == text then - self:DebugF(1, "Detected pet skill train %q", quest) - return self:SetTurnedIn() - end - end end @@ -92,16 +82,6 @@ function TourGuide:UI_INFO_MESSAGE(event, msg) end -function TourGuide:CRAFT_SHOW() - if not CraftIsPetTraining() then return end - for i=1,GetNumCrafts() do - local name, rank = GetCraftInfo(i) - self.db.char.petskills[name.. (rank == "" and "" or (" (" .. rank .. ")"))] = true - end - if self:GetObjectiveInfo() == "PET" then self:UpdateStatusFrame() end -end - - local orig = GetQuestReward GetQuestReward = function(...) local quest = GetTitleText() QuestTracking.lua @@ -27,7 +27,6 @@ TourGuide.icons = setmetatable({ BUY = "Interface\\Icons\\INV_Misc_Coin_01", BOAT = "Interface\\Icons\\Spell_Frost_SummonWaterElemental", GETFLIGHTPOINT = "Interface\\Icons\\Ability_Hunter_EagleEye", - PET = "Interface\\Icons\\Ability_Hunter_BeastCall02", }, {__index = function() return "Interface\\Icons\\INV_Misc_QuestionMark" end}) @@ -41,7 +40,6 @@ function TourGuide:Initialize() trackquests = true, completion = {}, currentguide = "No Guide", - petskills = {}, mapquestgivers = true, mapnotecoords = true, alwaysmapnotecoords = false, TourGuide.lua @@ -126,9 +126,6 @@ T Taming the Beast (Part 2) |C|Hunter| |QID|6101| A Taming the Beast (Part 3) |C|Hunter| |QID|6102| C Taming the Beast (Part 3) |C|Hunter| |N|Tame a strigid screecher (55,73)| |QID|6102| T Taming the Beast (Part 3) |C|Hunter| |QID|6102| -P Claw (Rank 2) |N|Tame a Strigid Hunter| |C|Hunter| -P Growl (Rank 2) |N|Tame a Strigid Hunter| |C|Hunter| -N Tame your pet |C|Hunter| |N|Elder Nightsaber (42,42) is nice| A Heeding the Call |C|Druid| |QID|5923| TourGuide_Alliance/01_12_Teldrassil.lua @@ -21,14 +21,11 @@ A The Zoram Strand |T| |QID|1008| T Onward to Ashenvale |N|Inside the Inn| |T| |QID|10752| A Raene's Cleansing (Part 1) |T| |QID|991| h Astranaar |T| -N Stable your pet |C|Hunter| |T| T Orendil's Cure |T| |QID|1020| A Elune's Tear |T| |QID|1033| A The Ancient Statuette |N|NPC at the small camp south of the Zoram Strand (14.8, 31.2)| |QID|1007| -P Claw (Rank 3) |C|Hunter| |N|Tame a Clattering Crawler, level 20. Teach it Growl (Rank 3)| - C The Ancient Statuette |N|Follow the shoreline north until you find the statue near the small rowboat (14.20, 20.64)| |QID|1007| T The Ancient Statuette |QID|1007| A Ruuzel |QID|1009| @@ -44,7 +41,6 @@ T Raene's Cleansing (Part 2) |T| |QID|1023| A Raene's Cleansing (Part 3) |T| |QID|1024| A An Aggressive Defense |T| |QID|1025| T The Zoram Strand |T| |QID|1008| -N Unstable your pet |C|Hunter| |T| C Elune's Tear |N|Northeast at Iris Lake, on the island (46,46).| |QID|1033| T Raene's Cleansing (Part 3) |N|To the east at the Moonwell (53.50, 46.30)| |QID|1024| A Raene's Cleansing (Part 4) |QID|1026| TourGuide_Alliance/22_24_Ashenvale.lua @@ -53,11 +53,6 @@ T Book of the Ancients |N|Back on shore at the tower| |QID|6027| C Reagents for Reclaimers Inc. (Part 2) |N|Get the last few reagents you need, you should have most by now.| |QID|1459| H Nijel's Point - -N Stable your pet |C|Hunter| |T| -P Claw (Rank 5) |N|Tame a Scorpashi, level 34. Found all around the Kodo Graveyard (58,50)| |C|Hunter| -N Keep this pet if you want |N|Otherwise get your pet out of stable| |C|Hunter| - T Reagents for Reclaimers Inc. (Part 2) |N|Skip the follow-up| |T| |QID|1459| T The Karnitol Shipwreck (Part 2) |N|Skip the follow-up| |T| |QID|1455| T Centaur Bounty |T| |QID|1387| TourGuide_Alliance/33_35_Desolace.lua @@ -8,10 +8,7 @@ B [Healing Potion] |N|Don't buy if you didn't find a Frost Oil and Gyrochronatom B [Lesser Invisibility Potion] |N|Don't buy if you didn't find a Frost Oil and Gyrochronatom| A Ironband Wants You! |N|From Prospector Stormpike in the Hall of Explorers (74,12)| |Z|Ironforge| |QID|707| -N Upgrade your ammo! |C|Hunter| - F Loch Modan -N Stable your pet |C|Hunter| A Badlands Reagent Run |N|In the house behind the Inn (37,49)| |Z|Loch Modan| |QID|2500| T Ironband Wants You! |N|Down at Ironband's Excavation Site (65,65)| |Z|Loch Modan| |QID|707| A Find Agmond |QID|738| @@ -24,12 +21,6 @@ A Barbecued Buzzard Wings |N|West, in the center of the zone (42,52)| |QID|703| N Kill any buzzards you see |N|For "Barbecued Buzzard Wings" and "Badlands Reagent Run"| -P Dash (Rank 2) |C|Hunter| |N|Tame a Ridge Stalker Patriarch (20,53)| -P Prowl (Rank 2) |C|Hunter| -H Stoutlager Inn |SZ|Thelsamar| |C|Hunter| -N Switch back to your cat |N|Don't dismiss the Badlands cat!| |C|Hunter| -R Badlands |C|Hunter| - C Mirages |N|Grind your way to the crate in the northwest at Camp Kosh (66,21)| |QID|718| A A Sign of Hope (Part 1) |N|At Hammertoe's Digsite. Note is on the right side of the dig (53,33)| |QID|720| C A Dwarf and His Tools |N|Kill the dwarfs at Hammertoe's Digsite or Angor Fortress (43,31)| |QID|719| TourGuide_Alliance/40_41_Badlands.lua @@ -119,7 +119,6 @@ T Taming the Beast (Part 2) |C|Hunter| |QID|6087| A Taming the Beast (Part 3) |C|Hunter| |QID|6088| C Taming the Beast (Part 3) |C|Hunter| |N|East of town| |QID|6088| T Taming the Beast (Part 3) |C|Hunter| |QID|6088| -P Bite (Rank 2) |N|Tame a Prarie Wolf Alpha. Keep it for your main pet unless you find The Rake.| |C|Hunter| A Training the Beast |C|Hunter| |QID|6089| A Heeding the Call |C|Druid| |QID|5928| TourGuide_Horde/01_12_Mulgore.lua @@ -13,7 +13,6 @@ T Conscript of the Horde |N|Just over the bridge from Durotar to The Barrens| |R A Crossroads Conscription |R|Orc, Troll, Undead| |NODEBUG| |QID|842| T Ak'Zeloth |N|Skip the follow-up| |R|Orc, Troll| |QID|809| -N Tame a Savannah Huntress while running to the Crossroads |C|Hunter| |R|Orc, Troll| R The Crossroads |N|Follow the road, taking left turn to the Crossroads (52,30)| |R|Orc, Troll, Undead| T Crossroads Conscription |R|Orc, Troll, Undead| |NODEBUG| |QID|842| TourGuide_Horde/12_20_Barrens.lua @@ -30,8 +30,6 @@ A Further Instructions (Part 1) |QID|1094| T Arachnophobia |T| |QID|6284| |N|Back at Sun Rock Retreat| A Boulderslide Ravine |T| |QID|6421| -N Stable your pet |C|Hunter| |T| -P Bite (Rank 3) |N|Tame a Deepmoss Creeper, along the road to the south.| |C|Hunter| C Boulderslide Ravine |N|Far south down the road, hidden little cave up in the mountains (61,92)| |QID|6421| T Blood Feeders |QID|6461| TourGuide_Horde/20_21_Stonetalon_Mountains.lua @@ -2,7 +2,6 @@ TourGuide:RegisterGuide("The Barrens (22-23)", "Stonetalon Mountains (23-25)", "Horde", function() return [[ F Camp Taurajo -N Get pet from stable |C|Hunter| |T| T Jorn Skyseer |T| |O| |QID|3261| A Ishamuhale |T| |O| |PRE|Jorn Skyseer| |QID|882| h Camp Taurajo |T| TourGuide_Horde/22_23_Southern_Barrens.lua @@ -57,11 +57,6 @@ T Troll Charm |QID|6462| H Splintertree Post -N Stable Pet |C|Hunter| -P Bite (Rank 4) |C|Hunter| |N|Tame a Ghostpaw Alpha| -P Claw (Rank 4) |C|Hunter| |N|Tame an Elder Ashenvale Bear| -N Retrieve Pet |C|Hunter| - T Freedom to Ruul |QID|6482| A Destroy the Legion |QID|9534| C Ordanus |N|Fight to the top of the tower (62.07, 51.03). Just kill Ordanus, then loot the head and jump out of there.| |QID|1088| TourGuide_Horde/26_27_Ashenvale.lua @@ -85,16 +85,11 @@ T Centaur Bounty |QID|1366| T Bone Collector |QID|5501| H Shadowprey Village - -N Stable pet |C|Hunter| - T Hand of Iruxos |QID|5381| T Other Fish to Fry |QID|6143| T Clam Bait |QID|6142| T Stealing Supplies |N|At the Gelkis village. Skip the follow-up| |QID|1370| -P Claw (Rank 5) |N|Tame a Scorpashi Lasher, level 34 (36,77)| |C|Hunter| - F Camp Taurajo R Shady Rest Inn |N|South of the road just after you enter Dustwallow Marsh| TourGuide_Horde/32_34_Desolace.lua @@ -11,8 +11,6 @@ A Investigate the Camp |QID|201| T Goblin Sponsorship (Part 3) |N|Baron Revilgaz on the boat balcony, 3rd floor of the inn (27.2, 76.9)| |QID|1181| A Goblin Sponsorship (Part 4) |QID|1182| -N Keep main pet stabled |N|Continue to use your Scorpashi Lasher| |C|Hunter| - F Grom'gol Base Camp A The Defense of Grom'gol (Part 1) |QID|568| A Mok'thardin's Enchantment (Part 1) |QID|570| @@ -22,8 +20,6 @@ A Trollbane |QID|638| A Bloody Bone Necklaces |QID|596| A The Vile Reef |QID|629| -P Dash (Rank 1) |N|Tame a Stranglethorn Tiger (29,11)| |C|Hunter| - N Save all Pages |N|Save all Green Hills of Stranglethorn pages| C Singing Blue Shards |N|From Basilisk on the coast far to the north (25,19)| |QID|605| C Tiger Mastery (Part 3) |N|Tigers between the troll ruins and Nessingwary's camp| |QID|187| TourGuide_Horde/34_36_StranglethornVale.lua @@ -1,20 +1,14 @@ TourGuide:RegisterGuide("Thousand Needles (37)", "Dustwallow Marsh (37-38)", "Horde", function() return [[ F Orgrimmar |N|Take the zeppelin, dur!| -B Delicious Cave Mold |L|4607 5| |N|From Kor'jus in the Cleft of Shadow (49.35, 52.85)| |C|Hunter| T Alliance Relations (Part 4) |N|Keldran in the Valley of Spirits (21,53)| |QID|1436| |Z|Orgrimmar| F The Crossroads h The Crossroads F Freewind Post -N Stable Pet |C|Hunter| - T The Swarm Grows (Part 2) |N|In The Shimmering Flats| |QID|1146| A The Swarm Grows (Part 3) |QID|1147| -P Bite (Rank 5) |N|Tame a Sparkleshell Snapper in Shimmering Flats and feed him those mushrooms you bought.| |C|Hunter| -N Keep the turtle |C|Hunter| - T Parts for Kravel |QID|1112| |N|At the Mirage Raceway (77.8, 77.2)| A Delivery to the Gnomes |QID|1114| T Delivery to the Gnomes |QID|1114| @@ -33,8 +27,6 @@ C Parts of the Swarm (Part 1) |QID|1148| T The Swarm Grows (Part 3) |QID|1147| H The Crossroads -N Abandon the turtle |N|If you want to| |C|Hunter| - T Parts of the Swarm (Part 1) |QID|1148| A Parts of the Swarm (Part 2) |QID|1184| ]]end) TourGuide_Horde/37_Thousand_Needles.lua 45106ff8af8ea664bae4498a3b66f34c07311bbd Tekkub tekkub@gmail.com http://github.com/Zariel/tourguide/commit/b7c47586dda5049ca665e57f5d5792f7577f37f8 b7c47586dda5049ca665e57f5d5792f7577f37f8 2008-10-03T18:29:48-07:00 2008-10-03T18:29:48-07:00 Remove pet training objectives, not needed with WoW 3.0 74d12e130a3839e5932a2b2c2647d8c0e9ede937 Tekkub tekkub@gmail.com