diff --git a/Parser.lua b/Parser.lua index 28e260c3..e95ef09f 100644 --- a/Parser.lua +++ b/Parser.lua @@ -6,7 +6,6 @@ local actiontypes = { T = "TURNIN", K = "KILL", R = "RUN", - t = "TRAIN", H = "HEARTH", h = "SETHEARTH", G = "GRIND", diff --git a/TourGuide.lua b/TourGuide.lua index 077e9197..00b471f1 100644 --- a/TourGuide.lua +++ b/TourGuide.lua @@ -22,7 +22,6 @@ TourGuide.icons = setmetatable({ RUN = "Interface\\Icons\\Ability_Tracking", MAP = "Interface\\Icons\\Ability_Spy", FLY = "Interface\\Icons\\Ability_Druid_FlightForm", - TRAIN = "Interface\\GossipFrame\\trainerGossipIcon", SETHEARTH = "Interface\\AddOns\\TourGuide\\resting.tga", HEARTH = "Interface\\Icons\\INV_Misc_Rune_01", NOTE = "Interface\\Icons\\INV_Misc_Note_01", diff --git a/TourGuide_Alliance/01_11_Dun_Morogh.lua b/TourGuide_Alliance/01_11_Dun_Morogh.lua index 956c1599..a4c046d8 100644 --- a/TourGuide_Alliance/01_11_Dun_Morogh.lua +++ b/TourGuide_Alliance/01_11_Dun_Morogh.lua @@ -43,7 +43,6 @@ A The Troll Cave A Scalding Mornbrew Delivery T Scalding Mornbrew Delivery |N|Run back to Anvilmar (28.8, 66.4)| A Bring Back the Mug -t Train (Level 4) A In Favor of the Light |C|Priest| A Beginnings |C|Warlock| @@ -80,7 +79,6 @@ T Tools for Steelgrill |N|Northeast of Kharanos (50.4, 49.1)| A Ammo for Rumbleshot A The Grizzled Den A Stocking Jetsteam -t Train (Level 6) C Ammo for Rumbleshot |N|Open the crate (44.1, 56.9)| C The Grizzled Den |N|Southwest of Kharanos (42.5, 54.4)| @@ -105,7 +103,6 @@ A Return to Marleth T Beer Basted Boar Ribs A Frostmane Hold |N|He's a little south of the inn.| A Operation Recombobulation |N|In a house a bit northwest of the inn (45.8, 49.4)| -t Train (Level 8) T Evershine |N|At Brewnall Village| A A Favor for Evershine @@ -128,7 +125,6 @@ T Frostmane Hold A The Reports T Operation Recombobulation T Return to Bellowfiz |N|Northeast of Kharanos.| -t Train (Level 10) A Taming the Beast (Part 1) |C|Hunter| C Taming the Beast (Part 1) |C|Hunter| diff --git a/TourGuide_Alliance/01_12_Azuremyst_Isle.lua b/TourGuide_Alliance/01_12_Azuremyst_Isle.lua index da912476..a8614208 100644 --- a/TourGuide_Alliance/01_12_Azuremyst_Isle.lua +++ b/TourGuide_Alliance/01_12_Azuremyst_Isle.lua @@ -3,7 +3,7 @@ return [[ A You Survived! T You Survived! A Replenishing the Healing Crystals -A Volatile Mutations +A Volatile Mutations C Volatile Mutations C Replenishing the Healing Crystals T Volatile Mutations @@ -13,7 +13,6 @@ T Replenishing the Healing Crystals A Urgent Delivery! T Urgent Delivery! A Rescue the Survivors! -t Train (level 2) A Shaman Training |C|Shaman| T Shaman Training |C|Shaman| A Spare Parts @@ -30,7 +29,6 @@ C Inoculation |N|Southeast of Crash Site| C Spare Parts H Ammen Vale T Healing the Lake -t Train (level 4) A Call of Earth (Part 1) |C|Shaman| T Spare Parts A Inoculation @@ -67,8 +65,6 @@ A Medicinal Purpose T Travel to Azure Watch T Word from Azure Watch h Azure Watch -t First Aid -t Train (Level 6) R Odesyus' Landing |N|The beach south of Azure Watch| A Cookie's Jumbo Gumbo @@ -113,14 +109,13 @@ T Learning The Language A Totem of Coo |N|No need to follow the NPC, point will be shown later| T Strange Findings A Nightstalker Clean Up, Isle 2... -t Train (level 8) C The Great Moongraze Hunt (Part 2) |N|North of Azure Watch| T Totem of Coo |N|On top the the cliifs north of Azure Watch (55,41)| A Totem of Tikti T Totem of Tikti |N|Jump to northeast with your wings, run over water to (64,39)| A Totem of Yor T Totem of Yor |N|*** Enter description here (63,47)| -A Totem of Vark +A Totem of Vark T Totem of Vark |N|Follow the NPC| A The Prophecy of Akida C The Prophecy of Akida @@ -149,7 +144,6 @@ R Azure Watch T Nightstalker Clean Up, Isle 2... T Deliver Them From Evil... N Grind until you are level 10 |LV|10| -t Train (level 10) A Coming of Age A Call of Fire (Part 1) |C|Shaman| R Exodar @@ -215,4 +209,4 @@ B Auberdine |C|Priest| B Auberdine |C|Mage| ]] -end) \ No newline at end of file +end) diff --git a/TourGuide_Alliance/01_12_Teldrassil.lua b/TourGuide_Alliance/01_12_Teldrassil.lua index c4a66eb1..1d4789ee 100644 --- a/TourGuide_Alliance/01_12_Teldrassil.lua +++ b/TourGuide_Alliance/01_12_Teldrassil.lua @@ -25,8 +25,6 @@ T Hallowed Sigil |C|Priest| T Simple Sigil |C|Warrior| T Verdant Sigil |C|Druid| |N|Up the ramp!| -t Train (Level 2) |N|Notice! There are no reminders to train levels after this. Remember to do so after even levels| - C The Balance of Nature (Part 2) |N|Mobs are to the northeast (60,35)| C Webwood Venom |N|To the northwest at Shadowthread Cave (57,33)| T A Good Friend |N|Just west of the cave entrance| @@ -61,7 +59,6 @@ T Crown of the Earth (Part 2) |N|South of the inn by the moonwell| A Crown of the Earth (Part 3) A Denalan's Earth |N|In front of the tower| A A Troubling Breeze |N|In the tower| -t First Aid |N|In the tower| A The Emerald Dreamcatcher |N|In the tower| A Twisted Hatred |N|In the tower| diff --git a/TourGuide_Alliance/21_22_Ashenvale.lua b/TourGuide_Alliance/21_22_Ashenvale.lua index ecf735d2..49b5ee13 100644 --- a/TourGuide_Alliance/21_22_Ashenvale.lua +++ b/TourGuide_Alliance/21_22_Ashenvale.lua @@ -46,7 +46,6 @@ C Elune's Tear |N|At the puddle northeast of Astranaar| T Raene's Cleansing (Part 3) |N|East of the puddle| A Raene's Cleansing (Part 4) R Silverwind Refuge |N|South, a house next to the lake. Grind your way unless you are level 22| -t Train level 22 |C|Hunter| C An Aggressive Defense |N|Camp northeast of Silverwind Refuge| H Astranaar |N|Or just run there if heartstone is on cooldown| T An Aggressive Defense @@ -58,4 +57,4 @@ R The Talondeep Path ]] -end) \ No newline at end of file +end) diff --git a/TourGuide_Alliance/38_40_Stranglethorn.lua b/TourGuide_Alliance/38_40_Stranglethorn.lua index 51166177..641c4795 100644 --- a/TourGuide_Alliance/38_40_Stranglethorn.lua +++ b/TourGuide_Alliance/38_40_Stranglethorn.lua @@ -12,12 +12,9 @@ A Skullsplitter Tusks T Sunken Treasure (Part 4) |N|Skip the next part| C Raptor Mastery (Part 3) |N|Around (33,39)| -C Some Assembly Required |N|Kill Snapjaw Crocolisks from the stream (38,30) to the lake (41,19)| C Water Elementals |N|On the island (20,23)| - -G Grind to level 39 |N|These elementals or raptors and basalisks around (33,39)| -G Grind east, past the road |N|To (41,41)| -C Venture Company Mining +C Some Assembly Required |N|Kill Snapjaw Crocolisks from the stream (38,30) to the lake (41,19)| +C Venture Company Mining |N|East past the road (41,41)| C Skullsplitter Tusks |N|In the camps around (42,37)| C Panther Mastery (Part 4) |N|Bhag'thera is anywhere between just north of Mosh'ogg (49,25) to just north of the ZG entrance (48,17)| @@ -51,14 +48,10 @@ T Panther Mastery (Part 4) A Raptor Mastery (Part 4) A The Green Hills of Stranglethorn T The Green Hills of Stranglethorn -G Grind to level 40 |N|You should have less than 25% to go| H Booty Bay T Excelsior F Ironforge - -t Train (Level 40) -B Mount ]] end) diff --git a/TourGuide_Alliance/43_45_Feralas.lua b/TourGuide_Alliance/43_45_Feralas.lua index 00c318d4..7cbd84bd 100644 --- a/TourGuide_Alliance/43_45_Feralas.lua +++ b/TourGuide_Alliance/43_45_Feralas.lua @@ -79,7 +79,6 @@ 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)| |Z|Darnassus| T Doling Justice (Part 2) diff --git a/TourGuide_Alliance/46_47_Hinterlands.lua b/TourGuide_Alliance/46_47_Hinterlands.lua index 2c821191..945fa194 100644 --- a/TourGuide_Alliance/46_47_Hinterlands.lua +++ b/TourGuide_Alliance/46_47_Hinterlands.lua @@ -4,7 +4,6 @@ return [[ F Stormwind City T In Search of The Temple |NODEBUG| A To The Hinterlands |NODEBUG| -t Train (Level 46) F Southshore R The Hinterlands |N|Path is behind Durnholde Keep (84,33), look for two gryphons.| |Z|Hillsbrad Foothills| diff --git a/TourGuide_Alliance/47_48_Tanaris.lua b/TourGuide_Alliance/47_48_Tanaris.lua index d321324b..586b7152 100644 --- a/TourGuide_Alliance/47_48_Tanaris.lua +++ b/TourGuide_Alliance/47_48_Tanaris.lua @@ -59,7 +59,6 @@ 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 diff --git a/TourGuide_Alliance/50_51_Searing_Gorge.lua b/TourGuide_Alliance/50_51_Searing_Gorge.lua index be4649c3..91be1e9c 100644 --- a/TourGuide_Alliance/50_51_Searing_Gorge.lua +++ b/TourGuide_Alliance/50_51_Searing_Gorge.lua @@ -2,7 +2,6 @@ TourGuide:RegisterGuide("Searing Gorge (50-51)", "Kalimdor (51)", "Alliance", function() return [[ F Ironforge -t Train (Level 50) A The Hunter's Charm |C|Hunter| h Ironforge A Assisting Arch Druid Staghelm |N|From the innkeeper| diff --git a/TourGuide_Alliance/51_52_UnGoro_Crater.lua b/TourGuide_Alliance/51_52_UnGoro_Crater.lua index b294dad5..300328c3 100644 --- a/TourGuide_Alliance/51_52_UnGoro_Crater.lua +++ b/TourGuide_Alliance/51_52_UnGoro_Crater.lua @@ -94,7 +94,6 @@ T Bungle in the Jungle |N|Skip the follow-up| T Super Sticky H Darnassus -t Train (Level 52) T Un'Goro Soil A Morrowgrain Research (Part 1) |N|Upstairs!| T Morrowgrain Research (Part 1) |N|Downstairs!| diff --git a/TourGuide_Alliance/53_54_Felwood.lua b/TourGuide_Alliance/53_54_Felwood.lua index ec13cfe0..995be243 100644 --- a/TourGuide_Alliance/53_54_Felwood.lua +++ b/TourGuide_Alliance/53_54_Felwood.lua @@ -80,8 +80,6 @@ T The Videre Elixir (Part 1) |N|Back at Gregan.| H Astranaar N Get your pet back |C|Hunter| F Talonbranch Glade -t Train |C|Druid| -t Train |C|Hunter| R Winterspring T The Videre Elixir (Part 2) diff --git a/TourGuide_Alliance/67_70_Netherstorm.lua b/TourGuide_Alliance/67_70_Netherstorm.lua index a0c6514c..344a8687 100644 --- a/TourGuide_Alliance/67_70_Netherstorm.lua +++ b/TourGuide_Alliance/67_70_Netherstorm.lua @@ -188,7 +188,6 @@ T B'naar Console Transcription |O| A Shutting Down Manaforge B'naar F Shattrath City -t Train (Level 68) |N|Port to a city, of course| H Area 52 N You should now be about 45-50% to 69 diff --git a/TourGuide_Horde/01_12_Durotar.lua b/TourGuide_Horde/01_12_Durotar.lua index d1e3f0fd..8f741835 100644 --- a/TourGuide_Horde/01_12_Durotar.lua +++ b/TourGuide_Horde/01_12_Durotar.lua @@ -49,13 +49,11 @@ A Practical Prey R Razor Hill |N|Follow the road north.| T Report to Orgnil A Dark Storms -t Train (Level 6) A Vanquish the Betrayers A Encroachment A Break a Few Eggs T A Peon's Burden h Razor Hill -t First Aid A Carry Your Weight |N|From watch tower northwest of town (49,40)| C Vanquish the Betrayers N If you have Benedict's Key, open the box on the ramparts upstairs from him. @@ -70,7 +68,6 @@ C From the Wreckage |N|Helps if you have water breathing| N Do the first half of "Encroachment" T From the Wreckage -t Train (Level 8) C Thwarting Kolkar Aggression |N|West of Sen'jin, each little camp has an item to pickup. (48,79)| C Break a Few Eggs |N|Kill Tigers if you see them.| C Practical Prey @@ -93,7 +90,6 @@ T Winds in the Desert A Securing the Lines T Encroachment |N|Back at Razor Hill| -t Train (Level 10) N Do Pet Quests |C|Hunter| N Train Encrusted Surf Crawler at (57,16)|C|Hunter| A Need for a Cure |N|Troll hidden in rocks to the west of Orgrimmar (41.5,18.6)| @@ -129,8 +125,6 @@ A Burning Shadows |U|4903| |O| T Hidden Enemies (Part 2) |N|And back to Thrall! Skip the follow-up.| H Razor Hill -t Train (First Aid) -t Train (Level 12) A Conscript of the Horde |N|Just outside the western entrance of Razor Hill (50.9, 43.6)| ]] end) diff --git a/TourGuide_Horde/01_12_Mulgore.lua b/TourGuide_Horde/01_12_Mulgore.lua index a780c2ff..47faceb9 100644 --- a/TourGuide_Horde/01_12_Mulgore.lua +++ b/TourGuide_Horde/01_12_Mulgore.lua @@ -17,7 +17,6 @@ T Etched Note |C|Hunter| T Simple Note |C|Warrior| T Rune-Inscribed Note |C|Shaman| T Verdant Note |C|Druid| -t Train (Level 2) T A Humble Task (Part 1) |N|Southeast at the well (50,81)| A A Humble Task (Part 2) diff --git a/TourGuide_Horde/01_12_TirisfalGlades.lua b/TourGuide_Horde/01_12_TirisfalGlades.lua index c63f617f..eb1a35d3 100644 --- a/TourGuide_Horde/01_12_TirisfalGlades.lua +++ b/TourGuide_Horde/01_12_TirisfalGlades.lua @@ -15,7 +15,6 @@ A Encrypted Scroll |C|Rogue| A Tainted Scroll |C|Warlock| T Encrypted Scroll |C|Rogue| T Tainted Scroll |C|Warlock| -t Train (Level 2) C The Damned C Rattling the Rattlecages @@ -51,7 +50,6 @@ T Vital Intelligence A At War With The Scarlet Crusade (Part 1) T A Rogue's Deal (Part 1) h Gallows' End Tavern -t Train (Level 4) A A New Plague (Part 1)|N|Near the herbalism trainer| C A New Plague (Part 1) @@ -95,7 +93,6 @@ A A New Plague (Part 3) T Graverobbers A Forsaken Duties A The Prodigal Lich -t Train (Level 8) C The Mills Overrun |N|At Agamand Mills| C The Haunted Mills @@ -118,7 +115,6 @@ C Rear Guard Patrol |N|At the farm further east down the road (75,60).| T Rear Guard Patrol T Return To The Magistrate T The Chill of Death |N|Buy the coarse thread off the vendor| -t Train (Level 10) R Undercity T The Prodigal Lich |N|In the magic quarter| @@ -158,7 +154,6 @@ T At War With The Scarlet Crusade (Part 4) |N|Back in Brill| C The Family Crypt |N|At Agamand Mills| T The Family Crypt T The Prodigal Lich Returns |N|Back in Undercity| -t Train (Level 12) F Orgrimmar f Grab flight point ]] diff --git a/TourGuide_Horde/01_13_Eversong.lua b/TourGuide_Horde/01_13_Eversong.lua index 4db62232..35767a11 100644 --- a/TourGuide_Horde/01_13_Eversong.lua +++ b/TourGuide_Horde/01_13_Eversong.lua @@ -9,8 +9,6 @@ A Warlock Training |C|Warlock| T Warlock Training |C|Warlock| A Windows to the Source |C|Warlock| -t Train (Level 2) - A Well Watcher Solanian T Well Watcher Solanian A The Shrine of Dath'Remar @@ -32,7 +30,6 @@ C Solanian's Belongings |N|South near a crystal, Southwest near a pond, West nea T Thirst Unending T A Fistful of Slivers -t Train (Level 4) T The Shrine of Dath'Remar T Solanian's Belongings T Aggression @@ -61,7 +58,6 @@ A Unstable Mana Crystals A Wanted: Thaelis the Hungerer |N|On a wanted poster (48,46)| T Completing the Delivery h Falconwing Square -t Train First Aid |N|Upstairs in the inn| C Major Malfunction C Unstable Mana Crystals @@ -72,7 +68,6 @@ T Unstable Mana Crystals T Wanted: Thaelis the Hungerer A Delivery to the North Sanctum A Darnassian Intrusions -t Train (Level 6) |N|If you can| R North Sanctum A Roadside Ambush |N|Down the path (45,56)| @@ -111,12 +106,8 @@ R Falconwing Square A Incriminating Documents |U|20765| |O| T Incriminating Documents |O| A The Dwarven Spy -t Train (Level 6) - C The Dwarven Spy |N|Near North Sanctum| - T The Dwarven Spy |N|Back at Falconwing Square| -t Train (Level 8) A The Dead Scar |N|To the Southeast (50,51)| C The Dead Scar |N|Slightly to the South| @@ -181,7 +172,6 @@ T Swift Discipline R Silvermoon City B [Suntouched Special Reserve] |N|Vinemaster Suntouched (80,58), for "The Party Never Ends"| -t Train (Level 10) R Eversong Woods T The Magister's Apprentice |N|Follow the road East (67,57)| diff --git a/TourGuide_Horde/12_15_Barrens.lua b/TourGuide_Horde/12_15_Barrens.lua index 29c2bcbf..3f1a5d74 100644 --- a/TourGuide_Horde/12_15_Barrens.lua +++ b/TourGuide_Horde/12_15_Barrens.lua @@ -27,8 +27,6 @@ A Return to Jahan |R|Tauren| F The Crossroads |R|Tauren| T Return to Jahan |R|Tauren| -t Bows |C|Hunter| |R|Tauren| |N|Run all the way to Orgrimmar and get this from the weapon trainer. Fly back to Crossroads| - T Conscript of the Horde |N|Just over the bridge from Durotar to The Barrens| |R|Orc| T Conscript of the Horde |N|Just over the bridge from Durotar to The Barrens| |R|Troll| T Conscript of the Horde |N|Just over the bridge from Durotar to The Barrens| |R|Undead| @@ -126,13 +124,9 @@ f Camp Taurajo N Get "Melor Sends Word" if needed. R Mulgore R Thunder Bluff |N|Thunder Bluff (37.0,31.8)| -t Weapon Master |N|(40,62)| -t Class Training T Apothecary Zamah |N|Cave below Spirit Rise (22.9,20.9)| -t First Aid |N|First Aid Trainer (29.6,21.3)| -f Thunder Bluff A The Sacred Flame (Part 1) |N|(55.1,53.1)| -H The Crossroads +F The Crossroads T Lost in Battle C Prowlers of the Barrens |N|(37,20)| C Harpy Lieutenants |N|Kill Witchwing Slayer's - Northwest Barrens (38,14)| @@ -188,7 +182,6 @@ T Consumed by Hatred T Altered Beings A Egg Hunt F Orgrimmar -t Level 20 A The Ashenvale Hunt H The Crossroads F Ratchet diff --git a/TourGuide_Horde/13_20_Ghostlands.lua b/TourGuide_Horde/13_20_Ghostlands.lua index a36476e9..2a49f176 100644 --- a/TourGuide_Horde/13_20_Ghostlands.lua +++ b/TourGuide_Horde/13_20_Ghostlands.lua @@ -204,8 +204,6 @@ T Captives at Deatholme R Tranquillien A Fly to Silvermoon City |R|Blood Elf| F Silvermoon City -t Train (First Aid) -t Train (Level 20) T Fly to Silvermoon City |N|(53,71)| |R|Blood Elf| T Hero of the Sin'dorei |N|(53,20)| |O| diff --git a/TourGuide_Horde/25_26_Thousand_Needles.lua b/TourGuide_Horde/25_26_Thousand_Needles.lua index 9168d787..6ccec20a 100644 --- a/TourGuide_Horde/25_26_Thousand_Needles.lua +++ b/TourGuide_Horde/25_26_Thousand_Needles.lua @@ -29,7 +29,6 @@ A Washte Pawne |U|5103| |O| T A New Ore Sample F Thunder Bluff |N|For training| -t Abilities/Spells T Melor Sends Word A Steelsnap |N|Hunter Rise| A The Sacred Flame |N|NPC is in the area connecting Elder and Hunter Rises|]] diff --git a/TourGuide_Horde/46_47_Hinterlands.lua b/TourGuide_Horde/46_47_Hinterlands.lua index 5ededd09..815936e1 100644 --- a/TourGuide_Horde/46_47_Hinterlands.lua +++ b/TourGuide_Horde/46_47_Hinterlands.lua @@ -44,8 +44,6 @@ T Stalking the Stalkers T Hunt the Savages T Avenging the Fallen -t Train First Aid |N|Fly to Hammerfall and train if you need to| - F Tarren Mill T Venom Bottles A Undamaged Venom Sac diff --git a/TourGuide_Horde/51_52_UnGoro_Crater.lua b/TourGuide_Horde/51_52_UnGoro_Crater.lua index faad13aa..dfd7b56e 100644 --- a/TourGuide_Horde/51_52_UnGoro_Crater.lua +++ b/TourGuide_Horde/51_52_UnGoro_Crater.lua @@ -89,8 +89,6 @@ N Make sure you have at least 30 ooze samples for "... and a Batch of Ooze" R Silithus R Cenarion Hold -f Cenarion Hold - F Gadgetzan T Super Sticky T Bungle in the Jungle @@ -101,7 +99,6 @@ A Un'goro Soil T Un'goro Soil A Morrowgrain Research T Morrowgrain Research -t Train! H The Crossroads F Ratchet