Merge branch 'master' into LightHeadedNPCMapping

TekNoLogic · Apr 30, 2008 · 6727398 · 6727398
2 parents 25323d3 + 37911e4
commit 6727398
Show file tree

Hide file tree

Showing 39 changed files with 624 additions and 608 deletions.
diff --git a/TourGuide_Alliance/01_11_Dun_Morogh.lua b/TourGuide_Alliance/01_11_Dun_Morogh.lua
@@ -15,7 +15,7 @@ A Glyphic Memorandum |C|Mage| |R|Gnome| |QID|3114|
 A Encrypted Memorandum |C|Rogue| |R|Gnome| |QID|3113|
 A Simple Memorandum |C|Warrior| |R|Gnome| |QID|3112|
 
-A Coldridge Valley Mail Delivery (Part 1)
+A Coldridge Valley Mail Delivery (Part 1) |QID|233|
 A A New Threat |QID|170|
 C A New Threat |QID|170|
 T A New Threat |QID|170|
@@ -32,13 +32,13 @@ T Simple Memorandum |C|Warrior| |R|Gnome| |QID|3112|
 
 A A Refugee's Quandary |QID|3361|
 
-T Coldridge Valley Mail Delivery (Part 1)
-A Coldridge Valley Mail Delivery (Part 2)
+T Coldridge Valley Mail Delivery (Part 1) |QID|233|
+A Coldridge Valley Mail Delivery (Part 2) |QID|234|
 A The Boar Hunter |QID|183|
 C The Boar Hunter |QID|183|
 T The Boar Hunter |QID|183|
 
-T Coldridge Valley Mail Delivery (Part 2)
+T Coldridge Valley Mail Delivery (Part 2) |QID|234|
 A The Troll Cave |QID|182|
 A Scalding Mornbrew Delivery |QID|3364|
 T Scalding Mornbrew Delivery |N|Run back to Anvilmar (28.8, 66.4)| |QID|3364|
@@ -56,15 +56,15 @@ T The Troll Cave |QID|182|
 A The Stolen Journal |QID|218|
 C The Stolen Journal |N|Back of the cave, lower level (31,80)| |QID|218|
 T The Stolen Journal |QID|218|
-A Senir's Observations (Part 1)
+A Senir's Observations (Part 1) |QID|282|
 
 T A Refugee's Quandary |N|Back in Anvilmar.| |QID|3361|
-T Senir's Observations (Part 1) |N|East of Anvilmar (33.5, 71.8)|
-A Senir's Observations (Part 2)
+T Senir's Observations (Part 1) |N|East of Anvilmar (33.5, 71.8)| |QID|282|
+A Senir's Observations (Part 2) |QID|420|
 A Supplies to Tannok |QID|2160|
 
 R Kharanos |N|You should be able to just run thru the tunnel.|
-T Senir's Observations (Part 2)
+T Senir's Observations (Part 2) |QID|420|
 A Beer Basted Boar Ribs |QID|384|
 T Supplies to Tannok |QID|2160|
 h Thunderbrew Distillery
@@ -126,15 +126,15 @@ A The Reports |QID|291|
 T Operation Recombobulation |QID|412|
 T Return to Bellowfiz |N|Northeast of Kharanos.| |QID|320|
 
-A Taming the Beast (Part 1) |C|Hunter|
-C Taming the Beast (Part 1) |C|Hunter|
-T Taming the Beast (Part 1) |C|Hunter|
-A Taming the Beast (Part 2) |C|Hunter|
-C Taming the Beast (Part 2) |C|Hunter|
-T Taming the Beast (Part 2) |C|Hunter|
-A Taming the Beast (Part 3) |C|Hunter|
-C Taming the Beast (Part 3) |C|Hunter|
-T Taming the Beast (Part 3) |C|Hunter|
+A Taming the Beast (Part 1) |C|Hunter| |QID|6064|
+C Taming the Beast (Part 1) |C|Hunter| |QID|6064|
+T Taming the Beast (Part 1) |C|Hunter| |QID|6064|
+A Taming the Beast (Part 2) |C|Hunter| |QID|6084|
+C Taming the Beast (Part 2) |C|Hunter| |QID|6084|
+T Taming the Beast (Part 2) |C|Hunter| |QID|6084|
+A Taming the Beast (Part 3) |C|Hunter| |QID|6085|
+C Taming the Beast (Part 3) |C|Hunter| |QID|6085|
+T Taming the Beast (Part 3) |C|Hunter| |QID|6085|
 A Training the Beast |C|Hunter| |QID|6103|
 
 A Speak with Bink |C|Mage| |QID|1879|
@@ -160,13 +160,13 @@ A Onin's Report |C|Rogue| |QID|2239|
 T Onin's Report |C|Rogue| |QID|2239|
 
 T Muren Stormpike |C|Warrior| |QID|1679|
-A Vejrek's Head |C|Warrior|
+A Vejrek |C|Warrior| |QID|1678|
 R Dun Morogh |C|Warrior|
-C Vejrek's Head |N|(27.7, 57.7)| |C|Warrior|
-T Vejrek's Head |C|Warrior|
+C Vejrek |N|(27.7, 57.7)| |C|Warrior| |QID|1678|
+T Vejrek |C|Warrior| |QID|1678|
 A Tormus Deepforge |C|Warrior| |QID|1680|
 T Tormus Deepforge |C|Warrior| |QID|1680|
-A Ironabnd's Compound |C|Warrior|
+A Ironband's Compound |C|Warrior| |QID|1684|
 R Dun Morogh |C|Warrior|
 C Ironband's Compound |N|(77.9, 62.2)| |C|Warrior| |QID|1681|
 T Ironband's Compound |C|Warrior| |QID|1681|

diff --git a/TourGuide_Alliance/01_12_Azuremyst_Isle.lua b/TourGuide_Alliance/01_12_Azuremyst_Isle.lua
@@ -46,16 +46,16 @@ C Spare Parts |QID|9305|
 
 H Ammen Vale
 T Healing the Lake |QID|9294|
-A Call of Earth (Part 1) |C|Shaman|
+A Call of Earth (Part 1) |C|Shaman| |QID|9449|
 T Spare Parts |QID|9305|
 T Inoculation |QID|9303|
 A The Missing Scout |QID|9309|
-T Call of Earth (Part 1) |N|Northwest of Crash Site (71,40)| |C|Shaman|
-A Call of Earth (Part 2) |C|Shaman|
-C Call of Earth (Part 2) |C|Shaman|
-T Call of Earth (Part 2) |C|Shaman|
-A Call of Earth (Part 3) |C|Shaman|
-T Call of Earth (Part 3) |N|At the Crash Site| |C|Shaman|
+T Call of Earth (Part 1) |N|Northwest of Crash Site (71,40)| |C|Shaman| |QID|9449|
+A Call of Earth (Part 2) |C|Shaman| |QID|9450|
+C Call of Earth (Part 2) |C|Shaman| |QID|9450|
+T Call of Earth (Part 2) |C|Shaman| |QID|9450|
+A Call of Earth (Part 3) |C|Shaman| |QID|9451|
+T Call of Earth (Part 3) |N|At the Crash Site| |C|Shaman| |QID|9451|
 
 T The Missing Scout |N|Southwest of Crash Site (72.03,60.77)| |QID|9309|
 A The Blood Elves |QID|10303|
@@ -79,7 +79,7 @@ A Find Acteon! |QID|9453|
 
 R Azure Watch |N|Follow the road west|
 T Find Acteon! |QID|9453|
-A The Great Moongraze Hunt (Part 1)
+A The Great Moongraze Hunt (Part 1) |QID|9454|
 A Medicinal Purpose |QID|9463|
 T Travel to Azure Watch |QID|9313|
 T Word from Azure Watch |QID|9314|
@@ -96,14 +96,14 @@ A I've Got a Plant |QID|9530|
 T Cookie's Jumbo Gumbo |QID|9512|
 A Reclaiming the Ruins |QID|9513|
 A Precious and Fragile Things Need Special Handling |QID|9523|
-C The Great Moongraze Hunt (Part 1)
+C The Great Moongraze Hunt (Part 1) |QID|9454|
 C Medicinal Purpose |QID|9463|
 C I've Got a Plant |N|Look for a Hollowed out tree north of Odesyus' Landing (47.4,63.5), leaves are around the ground| |QID|9530|
 
 T Medicinal Purpose |N|Back at Azure Watch| |QID|9463|
 A An Alternative Alternative |QID|9473|
-T The Great Moongraze Hunt (Part 1)
-A The Great Moongraze Hunt (Part 2)
+T The Great Moongraze Hunt (Part 1) |QID|9454|
+A The Great Moongraze Hunt (Part 2) |QID|10324|
 C An Alternative Alternative |QID|9473|
 
 K Infected Nightstalker Runts |N|Looking for [Faintly Glowing Crystal]| |L|23678|
@@ -129,7 +129,7 @@ A Totem of Coo |N|No need to follow the NPC, point will be shown later| |QID|953
 T Strange Findings |QID|9455|
 A Nightstalker Clean Up, Isle 2... |QID|9456|
 
-C The Great Moongraze Hunt (Part 2) |N|North of Azure Watch|
+C The Great Moongraze Hunt (Part 2) |N|North of Azure Watch| |QID|10324|
 
 T Totem of Coo |N|On top the the cliifs north of Azure Watch (55.2, 41.7)| |QID|9539|
 A Totem of Tikti |QID|9540|
@@ -158,7 +158,7 @@ T Help Tavara |C|Priest| |QID|9586|
 T An Alternative Alternative |QID|9473|
 T The Prophecy of Akida |QID|9544|
 A Stillpine Hold |QID|9559|
-T The Great Moongraze Hunt (Part 2)
+T The Great Moongraze Hunt (Part 2) |QID|10324|
 
 T Tree's Company |N|Back at Odesyus' Landing| |QID|9531|
 A Show Gnomercy |QID|9537|
@@ -170,7 +170,7 @@ A Deliver Them From Evil... |QID|9602|
 T Deliver Them From Evil... |N|Back at Azure Watch| |QID|9602|
 A Coming of Age |N|You must be Lv 10 to accept this| |QID|9623|
 A Strength of One |C|Warrior| |QID|9582|
-A Call of Fire (Part 1) |C|Shaman|
+A Call of Fire (Part 1) |C|Shaman| |QID|9464|
 A Control |C|Mage| |QID|9595|
 
 R The Exodar |N|Follow the road west|
@@ -184,8 +184,8 @@ T Stillpine Hold |QID|9559|
 
 C Strength of One |C|Warrior| |QID|9582|
 C Beasts of the Apocalypse! |N|Northeast of Stillpine Hold at the Menagerie Wreckage (52.01,20.91)| |QID|9560|
-T Call of Fire (Part 1) |N|Go further northeast| |C|Shaman|
-A Call of Fire (Part 2) |C|Shaman|
+T Call of Fire (Part 1) |N|Go further northeast| |C|Shaman| |QID|9464|
+A Call of Fire (Part 2) |C|Shaman| |QID|9465|
 
 T Beasts of the Apocalypse! |N|Back at Stillpine Hold| |QID|9560|
 A Chieftain Oomooroo |QID|9573|
@@ -202,8 +202,8 @@ K Crazed Wildkin |C|Shaman| |L|23733|
 T The Kurken is Lurkin' |QID|9570|
 A The Kurken's Hide |QID|9571|
 T The Kurken's Hide |QID|9571|
-T Call of Fire (Part 2) |C|Shaman|
-A Call of Fure (Part 3) |C|Shaman|
+T Call of Fire (Part 2) |C|Shaman| |QID|9465|
+A Call of Fure (Part 3) |C|Shaman| |QID|9467|
 
 C Murlocs... Why Here? Why Now? |N|West of Stillpine Hold, along the shore (33.5, 22.0)| |QID|9562|
 C Control |N|Keep killing murlocs until a Quel'dorei Magewraith appears| |C|Mage| |QID|9595|
@@ -213,9 +213,9 @@ A Gurf's Dignity |O| |U|23850| |QID|9564|
 T Gurf's Dignity |O| |QID|9564|
 A Warn Your People |N|From the Chief| |QID|9622|
 
-C Call of Fire (Part 3) |N|Head down to Silvermyst Isle, find the Wickerman Effigy (11,82)| |C|Shaman|
+C Call of Fire (Part 3) |N|Head down to Silvermyst Isle, find the Wickerman Effigy (11,82)| |C|Shaman| |QID|9467|
 U Orb of Returning |C|Shaman| |U|24335|
-T Call of Fire (Part 3) |C|Shaman|
-A Call of Fire (Part 4) |C|Shaman|
+T Call of Fire (Part 3) |C|Shaman| |QID|9467|
+A Call of Fire (Part 4) |C|Shaman| |QID|9468|
 ]]
 end)
diff --git a/TourGuide_Alliance/01_12_Elwynn_Forest.lua b/TourGuide_Alliance/01_12_Elwynn_Forest.lua
@@ -200,17 +200,17 @@ T Bartleby's Mug |C|Warrior| |QID|1665|
 A Marshal Haggard |C|Warrior| |QID|1666|
 
 N Get a Tome of Divinity |L|6775| |N|Go see Duthorian Rall in the Cathedral of Light| |C|Paladin|
-A The Tome of Divinity (Part 1) |C|Paladin| |U|6775|
-T The Tome of Divinity (Part 1) |C|Paladin|
-A The Tome of Divinity (Part 2) |C|Paladin|
-T The Tome of Divinity (Part 2) |C|Paladin| |N|In Trade District|
-A The Tome of Divinity (Part 3) |C|Paladin|
-T The Tome of Divinity (Part 3) |C|Paladin|
-A The Tome of Divinity (Part 4) |C|Paladin|
-T The Tome of Divinity (Part 4) |C|Paladin| |N|In the Cathedral of Light|
-A The Tome of Divinity (Part 5) |C|Paladin|
-T The Tome of Divinity (Part 5) |C|Paladin|
-A The Tome of Divinity (Part 6) |C|Paladin|
+A The Tome of Divinity (Part 1) |C|Paladin| |U|6775| |QID|1642|
+T The Tome of Divinity (Part 1) |C|Paladin| |QID|1642|
+A The Tome of Divinity (Part 2) |C|Paladin| |QID|1643|
+T The Tome of Divinity (Part 2) |C|Paladin| |N|In Trade District| |QID|1643|
+A The Tome of Divinity (Part 3) |C|Paladin| |QID|1644|
+T The Tome of Divinity (Part 3) |C|Paladin| |QID|1644|
+A The Tome of Divinity (Part 4) |C|Paladin| |QID|1780|
+T The Tome of Divinity (Part 4) |C|Paladin| |N|In the Cathedral of Light| |QID|1780|
+A The Tome of Divinity (Part 5) |C|Paladin| |QID|1781|
+T The Tome of Divinity (Part 5) |C|Paladin| |QID|1781|
+A The Tome of Divinity (Part 6) |C|Paladin| |QID|1786|
 
 T Dungar Longdrink |N|Back at the flight point| |R|Human| |QID|6261|
 A Return to Lewis |R|Human| |QID|6285|
@@ -230,9 +230,9 @@ A Dead-tooth Jack |C|Warrior| |QID|1667|
 C Dead-tooth Jack |N|To the southeast (89.2, 78.7)| |C|Warrior| |QID|1667|
 T Dead-tooth Jack |C|Warrior| |QID|1667|
 
-T The Tome of Divinity (Part 6) |N|West side of the island on Stonecaire Lake in Elwynn Forest (72.6, 51.5)| |U|6866| |C|Paladin|
-A The Tome of Divinity (Part 7) |C|Paladin|
-C The Tome of Divinity (Part 7) |N|Center of island in Stonecaire Lake in Elwynn Forest| |C|Paladin|
+T The Tome of Divinity (Part 6) |N|West side of the island on Stonecaire Lake in Elwynn Forest (72.6, 51.5)| |U|6866| |C|Paladin| |QID|1786|
+A The Tome of Divinity (Part 7) |C|Paladin| |QID|1787|
+C The Tome of Divinity (Part 7) |N|Center of island in Stonecaire Lake in Elwynn Forest| |C|Paladin| |QID|1787|
 
 H Stormwind City
 T Mirror Lake |C|Mage| |QID|1861|
@@ -241,9 +241,9 @@ T Surena Caledon |C|Warlock| |QID|1688|
 A The Binding |NODEBUG| |C|Warlock| |QID|1795|
 C The Binding |NODEBUG| |C|Warlock| |N|Summoning circle downstairs| |U|6928| |QID|1795|
 T The Binding |NODEBUG| |C|Warlock| |QID|1795|
-T The Tome of Divinity (Part 7) |N|In the Cathedral of Light| |C|Paladin|
-A The Tome of Divinity (Part 8) |C|Paladin|
-T The Tome of Divinity (Part 8) |C|Paladin|
+T The Tome of Divinity (Part 7) |N|In the Cathedral of Light| |C|Paladin| |QID|1787|
+A The Tome of Divinity (Part 8) |C|Paladin| |QID|1788|
+T The Tome of Divinity (Part 8) |C|Paladin| |QID|1788|
 
 T Elmore's Task |N|In the Dwarven District (51.7, 12.1)| |Z|Stormwind City| |QID|1097|
 A Stormpike's Delivery |QID|353|