Merge pull request #2444 from Cagomei/random-stuff-sitting-on-my-local

cata vashjir edits from discord
Ludovicus-Maior · Apr 4, 2023 · 6c2a84e · 6c2a84e
2 parents f792d12 + f681755
commit 6c2a84e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/WoWPro_Leveling/Horde/CATA_Vashjir.lua b/WoWPro_Leveling/Horde/CATA_Vashjir.lua
@@ -108,7 +108,7 @@ C Dah, Nunt... Dah, Nunt...|QID|25657|U|55190|M|58.21,49.04|Z|Kelp'thar Forest|N
 T Dah, Nunt... Dah, Nunt...|QID|25657|M|58.34,48.76|Z|Kelp'thar Forest|N|(UI Alert)|
 A Shark Weak|QID|27699|PRE|25657|M|58.34,48.76|Z|Kelp'thar Forest|N|(UI Alert)|
 C Shark Weak|QID|27699|M|59.25,46.87|Z|Kelp'thar Forest|N|Gnaws' Tooth can be found on the floor in this area.|
-K Blackfin|QID|25503|M|56.73,53.96|Z|Kelp'thar Forest|N|Find Blackfin. He is an orca that swims in the waters above The Accursed Reef. Kill him and loot Gliblingle's Map.|T|Blackfin|L|54640|
+K Blackfin|QID|25503|M|56.73,53.96|Z|Kelp'thar Forest|QO|1|N|Find Blackfin. He is an orca that swims in the waters above The Accursed Reef. Kill him and loot Gliblingle's Map.|T|Blackfin|
 T Blackfin's Booty|QID|25503|M|55.1,54.9|Z|Kelp'thar Forest|N|Turn the quest into the Sandy Mound.|
 T Shark Weak|QID|27699|M|55.41,38.94|Z|Kelp'thar Forest|N|To Budd.|
 A DUN-dun-DUN-dun-DUN-dun|QID|25670|PRE|27699|M|55.41,38.94|Z|Kelp'thar Forest|N|From Budd.|
@@ -180,7 +180,7 @@ A Undersea Inflation|QID|25218|PRE|25216|RANK|1|M|41.3,34.3|Z|Shimmering Expanse
 A Crabby Patrons|QID|25360|RANK|1|M|41.3,34.3|Z|Shimmering Expanse|N|From Felice.|
 C Crabby Patrons|QID|25360|M|41.7,34.5|S|Z|Shimmering Expanse|N|Kill Crabs.|
 C Undersea Inflation|QID|25218|S|U|54608|M|41.7,34.5|Z|Shimmering Expanse|N|While you are doing that, use Sambino's Air Balloon near any of the large blueish shells on the sea floor or the green coral formations to fill up the balloon. Keep doing this until you get the message that the balloon is full.|
-l Sambino's Air Valve|QID|25218|M|41.7,34.5|Z|Shimmering Expanse|N|Keep killing crabs until this item drops drops.|L|54611|
+l Sambino's Air Valve|QID|25218|M|41.7,34.5|Z|Shimmering Expanse|QO|2|N|Keep killing crabs until this item drops drops.|
 C Crabby Patrons|QID|25360|M|41.7,34.5|US|Z|Shimmering Expanse|N|Kill the remaining Crabs|
 C Undersea Inflation|QID|25218|US|U|54608|M|41.7,34.5|Z|Shimmering Expanse|N|While you are doing that, use Sambino's Air Balloon near any of the large blueish shells on the sea floor or the green coral formations to fill up the balloon. Keep doing this until you get the message that the balloon is full.|
 T Undersea Inflation|QID|25218|M|41.3,34.3|Z|Shimmering Expanse|N|To The Great Sambino.|
@@ -231,11 +231,11 @@ T We Are Not Alone|QID|25991|M|60.2,63.69|Z|Shimmering Expanse|N|Leave the brain
 A Body Blows|QID|25993|PRE|25991|RANK|1|Z|Shimmering Expanse|N|From Legionnaire Nazgrim.|M|60.2,63.69|
 A Hopelessly Gearless|QID|25992|RANK|1|Z|Shimmering Expanse|N|From Captian Vilethorn.|M|60.2,63.69|
 A Still Valuable|QID|25994|RANK|1|Z|Shimmering Expanse|N|From Wavespeaker Tulra.|M|60.2,63.69|
-C Still Valuable|QID|25994|S|M|61.2,56|Z|Shimmering Expanse|L|56194 5|N|Kill any naga in the area until you have looted 5 Mysterious Pearls.|
+C Still Valuable|QID|25994|S|M|61.2,56|Z|Shimmering Expanse|QO|1|N|Kill any naga in the area until you have looted 5 Mysterious Pearls.|
 C Hopelessly Gearless|QID|25992|M|59.2,59.2|Z|Shimmering Expanse|N|Find Idra'kess Weapon Racks and loot the Purloined Polearms from them.|S|
 C Body Blows|QID|25993|M|62.6,49.8|Z|Shimmering Expanse|N|Find 7 Nespirah Abscesses and attack them. They are small redish nodes along the walls. They can be hard to spot, as they blend in with everything around them, Position Unknown.|
 C Hopelessly Gearless|QID|25992|M|59.2,59.2|Z|Shimmering Expanse|N|Find Idra'kess Weapon Racks and loot the Purloined Polearms from them.|US|
-C Still Valuable|QID|25994|US|M|61.2,56|Z|Shimmering Expanse|L|56194 5|N|Kill Naga for the remaining Pearls.|
+C Still Valuable|QID|25994|US|M|61.2,56|Z|Shimmering Expanse|QO|1|N|Kill Naga for the remaining Pearls.|
 T Body Blows|QID|25993|Z|Shimmering Expanse|N|To Legionnaire Nazgrim.|M|60.2,63.69|
 T Hopelessly Gearless|QID|25992|Z|Shimmering Expanse|N|To Captian Vilethorn.|M|60.2,63.69|
 T Still Valuable|QID|25994|Z|Shimmering Expanse|N|To Wavespeaker Tulra.|M|60.2,63.69|
@@ -285,7 +285,7 @@ T Caught Off-Guard|QID|25952|Z|Shimmering Expanse|N|To Captian Vilethorn.|M|51.2
 T Swift Approach|QID|25953|Z|Shimmering Expanse|N|To Legionnaire Nazgrim.|M|51.21,63|
 T An Occupation of Time|QID|25954|Z|Shimmering Expanse|N|To Elendri Goldenbrow.|M|51.27,62.48|
 T Piece of the Past|QID|27717|N|To Elendri Goldenbrow.|M|51.27,62.48|Z|Shimmering Expanse|
-A The Call of the Blade|QID|27394|LEAD|25956|PRE|25953|RANK|1|Z|Shimmering Expanse|N|From Wavespeaker Tulra.|
+A The Call of the Blade|QID|27394|LEAD|25956|PRE|25953|RANK|1|Z|Shimmering Expanse|N|From Wavespeaker Tulra.|M|51.6,62.74|
 T The Call of the Blade|QID|27394|M|40.5,75.5|Z|Shimmering Expanse|N|Click the Skull to turn in the quest.|
 A Upon the Scene of Battle|QID|25956|RANK|1|M|40.5,75.5|Z|Shimmering Expanse|N|Accept the Followup.|
 T Upon the Scene of Battle|QID|25956|M|51.23,62.91|Z|Shimmering Expanse|N|To Captian Vilethorn.|
@@ -302,7 +302,7 @@ C To the Fathom-Lord's Call|QID|25637|S|QO|1|M|31.7,72.6|Z|Shimmering Expanse|N|
 C Built to Last|QID|25658|M|38.41,56.39|Z|Shimmering Expanse|N|Swimp way up to the Nar'shola Terrace. Activate the wards, they look like blue basins.|
 C To the Fathom-Lord's Call|QID|25637|US|QO|1|M|31.7,72.6|Z|Shimmering Expanse|N|Kill the remaining Kvaldir.|; Kvaldir invaders on the terrace slain: 16/16
 T Built to Last|QID|25658|Z|Shimmering Expanse|M|37.19,77.63|N|To Sira'kess Tide Priestess.|
-T To the Fathom-Lord's Call|QID|25637|Z|Shimmering Expanse|N|To Fathom-Lord Zin'jatar.|
+T To the Fathom-Lord's Call|QID|25637|Z|Shimmering Expanse|N|To Fathom-Lord Zin'jatar.|M|36.45,78.66|
 A Not Soon Forgotten|QID|25659|PRE|25637|RANK|1|M|36.5,78.5|Z|Shimmering Expanse|N|From Fathom-Lord Zin'jatar.|
 C Not Soon Forgotten|QID|25659|M|28.7,78.6|Z|Shimmering Expanse|N|Swim up the tunnel in front of you until you find Varkul the Unrelenting. He will be surrounded by 5 Sira'kess Sea Witches and some other naga. As long as they are not being attacked, they will channel spell that causes Varkul to take increased damage. So Attach Varkul until he calls in the other kvaldir. Then let the other naga tank him while you kill off the adds.|
 T Not Soon Forgotten|QID|25659|M|28.7,78.6|Z|Shimmering Expanse|
@@ -480,7 +480,7 @@ A Communing with the Ancient|QID|26140|PRE|26130|RANK|1|M|42.7,37.8|Z|Abyssal De
 T Communing with the Ancient|QID|26140|M|38.7,44.8|Z|Abyssal Depths|N|Enter L'ghorek the same way you entered Nespirah. The layout inside is the same. Go to the Brain Room inside L'ghorek. Speak to the brain to turn in Communing with the Ancient.|
 A Runestones of Binding|QID|26141|PRE|26140|RANK|1|M|38.7,44.8|Z|Abyssal Depths|N|From L'ghorek|
 A Ascend No More!|QID|26142|PRE|26140|RANK|1|M|38.7,44.8|Z|Abyssal Depths|N|From L'ghorek|
-C Runestones of Binding|QID|26141|S|M|31.2,58.8|Z|Abyssal Depths|L|57096 7|N|Kill any Twilight Candidates you see until you get 7 Runestones of Binding.|
+C Runestones of Binding|QID|26141|S|M|31.2,58.8|Z|Abyssal Depths|QO|1|N|Kill any Twilight Candidates you see until you get 7 Runestones of Binding.|
 C Ascend No More!|QID|26142|S|QO|1|M|28.1,57.5|Z|Abyssal Depths|N|Destroy Ancient Conduits.|; Ancient Conduits destroyed: 5/5
 l Twilight Cage Key|QID|26149|L|57118|N|Kill Twilight Hammer mobs until the key drops.|M|31.2,58.8|Z|Abyssal Depths|
 A Prisoners|QID|26149|RANK|1|M|31.2,58.8|Z|Abyssal Depths|U|57118|N|Accept the quest from the key.|

diff --git a/WoWPro_Leveling/Horde/INTRO_Goblin.lua b/WoWPro_Leveling/Horde/INTRO_Goblin.lua
@@ -12,9 +12,9 @@ A Taking Care of Business|QID|14138|M|56.52,77.00|N|From Sassy Hardwrench.|
 T Taking Care of Business|QID|14138|M|60.10,74.66|N|To Foreman Dampwick.|
 A Trouble in the Mines|QID|14075|M|60.10,74.66|N|From Foreman Dampwick.|PRE|14138|
 A Good Help is Hard to Find|QID|14069|M|60.10,74.66|N|From Foreman Dampwick.|PRE|14138|
-C Good Help is Hard to Find|QID|14069|M|70.29,82.50|N|Right-Click the Defiant Trolls to adjust their attitude as you head to the mines.|S|NC|
+C Good Help is Hard to Find|QID|14069|M|70.29,82.50|H|N|Right-Click the Defiant Trolls to adjust their attitude as you head to the mines.|S|NC|
 C Trouble in the Mines|QID|14075|M|71.02,76.19;74.59,83.67;65.05,88.22|CS|N|Go into the mines to kill worms.|
-C Good Help is Hard to Find|QID|14069|M|70.29,82.50|N|Finishing right-clicking the Defiant Trolls as you head out of the mines and back to Foreman Dampwick.|US|NC|
+C Good Help is Hard to Find|QID|14069|M|70.29,82.50|H|N|Finishing right-clicking the Defiant Trolls as you head out of the mines and back to Foreman Dampwick.|US|NC|
 T Trouble in the Mines|QID|14075|M|60.35,74.64|N|To Foreman Dampwick.|
 T Good Help is Hard to Find|QID|14069|M|60.35,74.64|N|To Foreman Dampwick.|
 A Kaja'Cola|QID|25473|M|60.35,74.64|N|From Foreman Dampwick.|PRE|14069&14075|
@@ -35,10 +35,10 @@ T Report for Tryouts|QID|24567|M|48.75,57.83|N|To Coach Crosscheck. You have no
 A The Replacements|QID|24488|M|48.75,57.83|N|From Coach Crosscheck.|PRE|24567|
 C The Replacements|QID|24488|M|43.05,62.79|N|Look around for Replacement Parts, they look like yellow crates. You can remain mounted in your Hot-Rod whilst you collect the crates.|U|46856|NC|S|
 R Drudgetown|QID|24520|M|43.50,70.25|N|Head to Drudgetown on your Hot Rod. Go under the ramp.|U|46856|ACTIVE|24488^14070|
-C Bruno Flameretardant|QID|14070|M|45.21,74.77|N|Beat down Bruno Flameretardant.|QO|1|U|46856|
-C Sudsy Magee|QID|14070|M|41.64,81.71|N|Beat down Sudsy Magee.|QO|4|U|46856|
-C Jack the Hammer|QID|14070|M|35.15,77.78|N|Beat down Jack the Hammer.|QO|3|U|46856|
-C Frankie Gearslip|QID|14070|M|36.67,72.32|N|Beat down Frankie Gearslip.|QO|2|U|46856|
+K Bruno Flameretardant|ACTIVE|14070|M|45.21,74.77|N|Beat down Bruno Flameretardant.|QO|1|U|46856|
+K Sudsy Magee|ACTIVE|14070|M|41.64,81.71|N|Beat down Sudsy Magee.|QO|4|U|46856|
+K Jack the Hammer|ACTIVE|14070|M|35.15,77.78|N|Beat down Jack the Hammer.|QO|3|U|46856|
+K Frankie Gearslip|ACTIVE|14070|M|36.67,72.32|N|Beat down Frankie Gearslip.|QO|2|U|46856|
 C The Replacements|QID|24488|M|43.05,62.79|N|Finish picking up Replacement Parts|U|46856|NC|US|
 T Off to the Bank|QID|26711^26712|M|30.09,71.67|N|To FBoK Bank Teller.|U|46856|
 A The New You|QID|14109^14110|PRE|26711^26712|M|30.09,71.67|N|From FBoK Bank Teller.|

diff --git a/WoWPro_Leveling/Neutral/DF_The_Forbidden_Reach.lua b/WoWPro_Leveling/Neutral/DF_The_Forbidden_Reach.lua
@@ -47,18 +47,20 @@ t Journal Entry: Experiments|QID|74866|M|35.49,58.80|Z|2151;The Forbidden Reach|
 ;C Sunder the Crater|QID|73140|QO|1|M|69.78,59.56|Z|2151;The Forbidden Reach|N|Kill Earth or Air Primalists.|S|
 ;C Sunder the Crater|QID|73140|QO|2|M|69.78,59.56|Z|2151;The Forbidden Reach|H|N|Destory the Primalists totems.|S|
 ;C Sunder the Crater|QID|73140|QO|3|M|69.78,59.56|Z|2151;The Forbidden Reach|N|Murder Adept Stormbringer|T|Adept Stormbringer|
+;C Sunder the Crater|QID|73140|M|69.78,59.56|Z|2151;The Forbidden Reach|N|Finish killing Earth or Air Primalists, and collect the rest of the totems.|US|
 ;T Sunder the Crater|QID|73140|M|35.51,58.66|Z|2151;The Forbidden Reach|N|To Scalecommander Azurathel.|
 
 ;A Up Close and Personal|QID|73194|PRE|74381|M|35.24,59.50|Z|2151;The Forbidden Reach|N|From Scalecommander Cindrethresh.|;need to find the PRE
 ;C Up Close and Personal|QID|73194|M|69.78,59.56|Z|2151;The Forbidden Reach|N|Use the spear to bring down a dragon, then kill it.|U|202642|T|Primal Stormtalon.|S|
 ;C Up Close and Personal|QID|73194|M|69.78,59.56|Z|2151;The Forbidden Reach|N|Use the spear to bring down a dragon, then kill it.|U|202642|T|Primal Stormtalon.|US|
-;C Sunder the Crater|QID|73140|M|69.78,59.56|Z|2151;The Forbidden Reach|N|Finish killing Earth or Air Primalists, and collect the rest of the totems.|US|
 ;T Up Close and Personal|QID|73194|M|35.24,59.50|Z|2151;The Forbidden Reach|N|To Scalecommander Cindrethresh.|
 
 ;A Everburning Embers|QID|73141|PRE|74381|M|34.43,58.59|Z|2151;The Forbidden Reach|N|From Tukkaraq.|
 ;C Everburning Embers|QID|73141|M|47.84,50.08|Z|2100;The Seige Creche|N|Kill the fire doods for their embers.|
 ;T Everburning Embers|QID|73141|M|34.43,58.59|Z|2151;The Forbidden Reach|N|To Tukkaraq.|
 
+
+;The Actual Guide
 P Valdrakken|AVAILABLE|74381|M|61.03,26.33|Z|2112;Valdrakken|N|This guide starts in Valdrakken. Make your way there by any means possible.
 A Hidden Legacies|QID|74381|M|61.03,26.33|Z|2112;Valdrakken|N|From UI Alert.|
 P The Seat of the Aspects|ACTIVE|74381|M|61.95,32.16|Z|2112;Valdrakken|N|Take the portal to The Seat of the Aspects or just fly up.|

diff --git a/WoWPro_Leveling/Neutral/DF_Waking_Shores.lua b/WoWPro_Leveling/Neutral/DF_Waking_Shores.lua
@@ -129,10 +129,9 @@ A Blacktalon Intel|QID|65992|PRE|65991|M|66.36,34.99|Z|2022|N|From Wrathion.|
 C Dragonhunter Igordan|QID|66956|M|64.28,33.32|Z|2022|N|Slay Dragonhunter Igordan.|S!US|T|Dragonhunter Igordan|RARE|
 C Blacktalon Intel|QID|65992|M|63.03,33.35|Z|2022|QO|1|CHAT|N|Consult Talonstalker Kavia.|T|Talonstalker Kavia|
 C Blacktalon Intel|QID|65992|M|65.10,29.36|Z|2022|QO|3|CHAT|N|Consult Right.|T|Right|
-K Meatgrinder Sotok|ACTIVE|65993|QO|1|M|63.22,29.66|Z|2022|N|Slay Meatgrinder Sotok when convenient.|S|T|Meatgrinder Sotok|
+K Meatgrinder Sotok|ACTIVE|65993|QO|1|M|63.22,29.66|Z|2022|N|Slay Meatgrinder Sotok when convenient.|T|Meatgrinder Sotok|
 A The Obsidian Citadel|QID|65995|M|63.22,29.66|Z|2022|N|From Qalashi Plans looted from Meatgrinder Sotok.|U|193874|
 C Blacktalon Intel|QID|65992|M|63.43,28.86|Z|2022|QO|2|CHAT|N|Consult Left.|T|Left|
-K Meatgrinder Sotok|ACTIVE|65993|QO|1|M|63.22,29.66|Z|2022|N|Slay Meatgrinder Sotok.|US|T|Meatgrinder Sotok|
 A The Obsidian Citadel|QID|65995|M|63.22,29.66|Z|2022|N|From Qalashi Plans looted from Meatgrinder Sotok.|O|U|193874|
 T Killjoy|QID|65993|M|62.65,33.19|Z|2022|N|To Wrathion.|
 T Blacktalon Intel|QID|65992|M|62.65,33.19|Z|2022|N|To Wrathion.|
@@ -530,7 +529,7 @@ T Under Lock and Key|QID|65782|M|37.35,46.62|Z|2022|N|To Ayasanth.|
 A The Shadow of His Wings|QID|65691|PRE|65687&65782|M|37.35,46.62|Z|2022|N|From Ayasanth.|RANK|3|
 C The Shadow of His Wings|QID|65691|QO|1|M|35.59,47.95|Z|2022|N|Go into the cave, most of the mobs are "orange" (neutral) and will clear out. Kill the hostiles and go stand by Cygenoth.|
 K Cygenoth|ACTIVE|65691|QO|2|M|35.03,45.44|Z|2022|N|Kill Cygenoth the Corrupted.|T|Cygenoth|
-T The Shadow of His Wings|QID|65691|M|39.56,48.40|Z|2022|N|To Ayasanth.|
+T The Shadow of His Wings|QID|65691|M|37.35,46.75|Z|2022|N|To Ayasanth.|
 
 C Talon Strike|QID|65956|M|36.73,63.14|Z|2022|N|Disrupt the Djaradin defenses. Extra action button will summon helpers.|EAB|S|
 C No Time for Heroes|QID|65957|M|35.53,68.52|Z|2022|QO|1|N|Slay Piercer Gigra on the top of the tower. Watch out for the orange circle on the ground. It will knock you off the tower.|T|Piercer Gigra|