Merge pull request #2747 from Cagomei/MoP-Remix-5/18/24

5/18/24

WoWPro/WoWPro.lua

@@ -565,7 +565,7 @@ function WoWPro:OnEnable()
 
     WoWPro:dbp("Scan to purge PlayerGetTimerunningSeasonID")
     -- Purge guides that do not match the SeasonID
-    local seasonID = _G.PlayerGetTimerunningSeason and _G.PlayerGetTimerunningSeasonID()
+    local seasonID = _G.PlayerGetTimerunningSeasonID()
     local to_purge = {}
     for gid, guide in pairs(WoWPro.Guides) do
         if guide['TimerunningSeasonID'] ~= seasonID then

WoWPro_Leveling/Classic_Cata/Alliance/CATA_Swamp_of_Sorrows.lua

@@ -37,9 +37,9 @@ T Kill Gil|QID|27598|M|83.86,40.04|Z|1435;Swamp of Sorrows|N|To Crazy Larry.|
 T Can't Take It With Them|QID|27599|M|83.86,40.04|Z|1435;Swamp of Sorrows|N|To Crazy Larry.|
 A In With a Bang|QID|27600|PRE|27598&27599|M|83.86,40.04|Z|1435;Swamp of Sorrows|N|From Crazy Larry.|
 F Fortune's Fist|QID|27600|M|83.59,37.85|Z|1435;Swamp of Sorrows|N|Talk to Lil' Crazy Jerry just north of the camp where the waypoint is, and choose to go into the cannon.|CHAT|
-C In With a Bang|QID|27600|QO|1|M|97.99,24.96|Z|1435;Swamp of Sorrows|N|Fuse is by the mast.|
-C In With a Bang|QID|27600|QO|2|M|98.58,27.93|Z|1435;Swamp of Sorrows|N|Powder is in the captain's cabin.|
-C In With a Bang|QID|27600|QO|3|M|93.83,27.15|Z|1435;Swamp of Sorrows|N|Publications are down in the hold.|
+C In With a Bang|QID|27600|QO|1|M|97.99,24.96|Z|1435;Swamp of Sorrows|N|Fuse is by the mast.|NC|
+C In With a Bang|QID|27600|QO|2|M|98.58,27.93|Z|1435;Swamp of Sorrows|N|Powder is in the captain's cabin.|NC|
+C In With a Bang|QID|27600|QO|3|M|93.83,27.15|Z|1435;Swamp of Sorrows|N|Publications are down in the hold.|NC|
 F Sorrowmurk|QID|27600|M|98.11,26.02|Z|1435;Swamp of Sorrows|N|Click on the cannon that is on the deck to go back.|CHAT|
 T In With a Bang|QID|27600|M|83.93,40.03|Z|1435;Swamp of Sorrows|N|To Crazy Larry.|
 A Baba Bogbrew|QID|27740|PRE|27600|M|83.93,40.03|Z|1435;Swamp of Sorrows|N|From Crazy Larry.|

WoWPro_Leveling/Retail/Horde/LEGION_Legion_Intro.lua

@@ -7,8 +7,8 @@ WoWPro:GuideNextGuide(guide, nil)
 WoWPro:GuideSteps(guide, function()
 return [[
 N It's Chromie Time!|AVAILABLE|62568|M|40.82,80.13|Z|85; Orgrimmar|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Warchief's Command Board in Orgrimmar. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in  Orgrimmar!|LVL|-60|CT|
-A Legion: The Legion Returns|QID|43926|M|40.82,80.11|Z|85; Orgrimmar|N|From Chromie after activating Legion timeline.|LVL|-60|CT|
-A Legion: The Legion Returns|QID|43926|M|49.67,76.45|Z|85; Orgrimmar|N|Select 'Fight the Legion' from the Warchief's Command Board.|LVL|60|
+;A Legion: Onward to Adventure in the Broken Isles|QID|60970|M|40.82,80.11|Z|85; Orgrimmar|N|From Chromie after activating Legion timeline.|LVL|-60|CT|
+A Legion: The Legion Returns|QID|43926|M|49.72,76.70|Z|85; Orgrimmar|N|Select 'Fight the Legion' from the Warchief's Command Board.|LVL|-60|CT|
 T Legion: The Legion Returns|QID|43926|M|46.01,13.79|Z|1; Durotar|N|To Holgar Stormaxe.|
 A To Be Prepared|QID|44281|PRE|43926|M|46.01,13.79|Z|1; Durotar|N|From Holgar Stormaxe.|
 C To Be Prepared|QID|44281|QO|3|M|47.67,13.47|Z|1; Durotar|NC|N|Click on the food to eat your last meal.|
@@ -49,6 +49,7 @@ T Keep Your Friends Close|QID|40605|M|53.09,57.35|Z|85; Orgrimmar|N|To Elthyn Da
 A In the Blink of an Eye|QID|44663^44184|M|52.80,56.92|Z|85; Orgrimmar|N|From Elthyn Da'rai.|
 C Kirin Tor Emissary|ACTIVE|44663|QO|1|M|58.25,89.99|Z|85; Orgrimmar|CHAT|N|[color=FFFF00]OPTIONAL[/color]\nAsk the Kirin Tor Emissary to send you to Dalaran.|
 C In the Blink of an Eye|ACTIVE|44663^44184|QO|2|M|49.84,48.28|Z|Dalaran@DeadwindPass|CHAT|N|Run to the area in the center of Dalaran (that used to be a park - now Chamber of the Guardians) and talk to Archmage Khadgar.|
+t Legion: Onward to Adventure in the Broken Isles|QID|60970|M|PLAYER|Z|627; Dalaran!Broken Isles|N|UI ALERT.|LVL|-60|CT|
 T In the Blink of an Eye|ACTIVE|44663^44184|M|57.62,45.76|Z|627; Dalaran|N|To Emissary Auldbridge.|
 D On to Class Halls|N|This ends the intro scenario and the Druid order hall guide will load.|C|Druid|GUIDE|EmmLegionDruid|
 D On to Class Halls|N|This ends the intro scenario and the Death Knight order hall guide will load.|C|Death Knight|GUIDE|EmmLegionDK|

WoWPro_Leveling/Retail/Neutral/INTRO_DeathKnight.lua

@@ -41,11 +41,11 @@ A Death's Challenge|QID|12733|PRE|12670|N|From Olrun the Battlecaller.|M|54.6,34
 A Tonight We Dine In Havenshire|QID|12679|PRE|12670|N|From Orithos the Sky Darkener.|M|53.2,36.9|
 C Death's Challenge|QID|12733|N|Find Death Knight Initiates and challenge them to a duel.|M|51.92,35.11|
 T Death's Challenge|QID|12733|M|54.6,34.2|N|To Olrun the Battlecaller.|
-C Tonight We Dine In Havenshire|QID|12679|N|Pick the glowing arrows.|M|56.2,49.4|S|
+C Tonight We Dine In Havenshire|QID|12679|N|Pick the glowing arrows.|M|56.2,49.4|S|NC|
 C If Chaos Drives, Let Suffering Hold The Reins|QID|12678|N|Kill Scarlet Crusaders and Citizens of Havenshire.|S|
 A Abandoned Mail|QID|12711|PRE|12670|N|From the Abandoned Mail.|M|55,46|
 C If Chaos Drives, Let Suffering Hold The Reins|QID|12678|N|Kill Scarlet Crusaders and Citizens of Havenshire.|US|
-C Tonight We Dine In Havenshire|QID|12679|N|Pick the glowing arrows.|M|56.2,49.4|US|
+C Tonight We Dine In Havenshire|QID|12679|N|Pick the glowing arrows.|M|56.2,49.4|US|NC|
 C Grand Theft Palomino|QID|12680|N|Get a horse and ride back to town (Make sure to grab one that is not near Stable Master Kitrik.). Go to Salanar the Horseman and press 1.|M|51.70,35.82|
 T Grand Theft Palomino|QID|12680|M|52.5,34.6|N|To Salanar the Horseman.|
 A Into the Realm of Shadows|QID|12687|PRE|12680|M|52.5,34.6|N|From Salanar the Horseman.|

WoWPro_Leveling/Retail/Neutral/LEGION_Order_Hall_DK.lua

@@ -29,7 +29,7 @@ A Artifact Specific Quest|QID|40930^40740^38990|M|73.11,46.85|Z|Dalaran!Dalaran!
 ;44550-Called to Acherus
 R Acherus: The Ebon Hold|QID|44550|N|Use your Deathgate|ACTIVE|44550|
 T Called to Acherus|QID|44550|M|49.66,51.25|N|To Siouxsie the Banshee.|
-A Rise, Champions|QID|43264|M|51.08,50.78|N|From Highlord Darion Mograine.|
+;A Rise, Champions|QID|43264|M|51.08,50.78|N|From Highlord Darion Mograine.|
 A Champion: Nazgrim|QID|39818|M|39.49,68.31|N|Pick Up Nazgrim as a follower.|ACTIVE|43264|
 A Champion: Thassarian|QID|39816|M|56.20,30.86|N|Pick up Thassarian as a follower.|ACTIVE|43264|
 T Rise, Champions|QID|43264|M|49.66,51.25|N|To Siouxsie the Banshee.|
@@ -354,7 +354,7 @@ P Windrunner's Sanctuary|QID|42449|M|55.33,24.04|Z|Dalaran!Dalaran!Dungeon|N|Tak
 R Durotar|QID|42449|M|47.32,17.67|Z|Durotar|N|Hop on your mount and fly to Thassarian in Durotar.|ACTIVE|42449|
 T Return of the Four Horsemen|QID|42449|M|47.32,17.67|Z|Durotar|N|To Thassarian.|
 A The Firstborn Rises|QID|42484|M|47.32,17.67|Z|Durotar|N|From Thassarian.|PRE|42449|
-C The Firstborn Rises|QID|42484|M|47.32,17.84|Z|Durotar|NC|N|Stand in the middle of the stones and use your extra action button to raise Nazgrim to Death Knighthood.|
+C The Firstborn Rises|QID|42484|M|47.32,17.84|Z|Durotar|NC|N|Stand in the middle of the stones and use your extra action button to raise Nazgrim to Death Knighthood.|EAB|
 P Acherus: The Ebon Hold|QID|42484|M|47.33,17.83|CC|Z|Durotar|N|Use the provided Death-Gate to return to your class hall.|ACTIVE|42484|
 T The Firstborn Rises|QID|42484|M|50.85,50.52|N|To Highlord Darion Mograine.|
 J On to Azsuna|QID|39718|N|This temporarily ends the order hall guide, you will be sent back here, when you finish Azuna. That guide will auto load when you close this step.|GUIDE|EmmAzsuna|

WoWPro_Leveling/Retail/Time_Running/TR_MOP_Dread_Wastes.lua

@@ -5,8 +5,6 @@ WoWPro:GuideNickname(guide, "TR_Dread Wastes")
 WoWPro:GuideName(guide,"TR_Dread Wastes")
 WoWPro:GuideSteps(guide, function()
 return [[
-N It's Chromie Time!|AVAILABLE|62567|M|62.25,29.93|Z|84;Stormwind City|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Hero's Call board in Stormwind. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in Stormwind!|LVL|-60|CT|FACTION|Alliance|
-N It's Chromie Time!|AVAILABLE|62568|M|40.82,80.13|Z|Orgrimmar|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Warchief's Command Board in Orgrimmar. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in  Orgrimmar!|LVL|-60|CT|FACTION|Horde|
 N Dread Wastes|QID|31847^31895^31000^31886^31390^31391^31656|N|There are many lead in quests, when you pick any of them up (except The Threat in the South) it also gives you the flightpath to Serpent's Spine in Vale of Eternal Blossoms (where Bowmistress Li is). This guide starts there.|
 N The Klaxxi Dailies/Rep|QID|31847^31895^31000^31886^31390^31391^31656|N|This zone is focused on the Klaxxi with thier quartermaster located at Klaxxi'vess who sells BS patters and VP gear.  By the time you get there you will probably be lvl 90 and so some of the dailies have been included in the guide.  Since it is random which ones you recieve, the guide doesn't tell you to pick them up, but if you do, the details and turn in will show for the ones you accept.|
 N The Klaxxi Reputation - Honored|QID|31175|REP|The Klaxxi;1337;honored|N|If you have reached honored while doing this guide, please switch to the dailies guide and do all the dalies to unlock things|

WoWPro_Leveling/Retail/Time_Running/TR_MOP_Krasarang_WildsA.lua

@@ -6,7 +6,6 @@ WoWPro:GuideName(guide,"TR_Krasarang Wilds")
 WoWPro:GuideNextGuide(guide, 'Kun-Lai Summit')
 WoWPro:GuideSteps(guide, function()
 return [[
-N It's Chromie Time!|AVAILABLE|62567|M|62.25,29.93|Z|84;Stormwind City|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Hero's Call board in Stormwind. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in Stormwind!|LVL|-60|CT|
 F Zhu's Watch|QID|30080|M|76.72,8.43|N|This guide starts at Zhu's watch. If you aren't there, fly or run there.|
 T Ken-Ken|QID|29873|M|76.23,7.13|N|To Ken-Ken. This was accepted from Xiao at the beginning of Valley of the 4 Winds.|
 A What's Eating Zhu's Watch?|QID|30079|M|76.22,7.06|N|From Ken-Ken.|
@@ -140,7 +139,7 @@ T Sha Can Awe|QID|30271|M|38.01,50.89|N|To Anduin Wrynn.|
 A In the House of the Red Crane|QID|30273|PRE|30271&30272&30695|M|38.01,50.89|N|From Anduin Wrynn.|
 C In the House of the Red Crane|QID|30273|M|40.46,54.65|N|Go up the center stairs then run straight back to the stairs into the basement. Talk to Chi-Ji to start the fight. He will float up and a large sha will appear, defeat it and you win. When the adds show up, you probably want to focus on them, since deaths cause Anduin to heal you.|
 T In the House of the Red Crane|QID|30273|M|40.43,49.18|N|To Chi-Ji (back outside).|
-R Nayeli Lagoon|QID|30667|M|51.7,75.34|
+R Nayeli Lagoon|AVAILABLE|30667|M|51.7,75.34|
 A Particular Plumage|QID|30667|M|51.67,75.30|N|From Tony Tuna.|
 l Stack of Papers|QID|31863|L|87798|M|52,73|N|Another of those grey items, this one doesn't sell for as much, but its free gold and XP, the path up is on the back side of the island.|
 f Marista|M|52.43,76.53|N|At Nan-Po.|

WoWPro_Leveling/Retail/Time_Running/TR_MOP_Krasarang_WildsH.lua

@@ -6,7 +6,6 @@ WoWPro:GuideName(guide,"TR_Krasarang WildsH")
 WoWPro:GuideNextGuide(guide, 'TR_Kun-Lai Summit')
 WoWPro:GuideSteps(guide, function()
 return [[
-N It's Chromie Time!|AVAILABLE|62568|M|40.82,80.13|Z|Orgrimmar|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Warchief's Command Board in Orgrimmar. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in  Orgrimmar!|LVL|-60|CT|
 F Zhu's Watch|AVAILABLE|30079|M|79.95,2.31|N|This guide starts at Zhu's watch. If you aren't there, fly or run there.|IZ|-6000|
 T Ken-Ken|QID|29873|M|76.22,7.07|N|To Ken-Ken. This was accepted from Xiao at the beginning of Valley of the 4 Winds.|
 A What's Eating Zhu's Watch?|QID|30079|M|76.22,7.07|N|From Ken-Ken.|

WoWPro_Leveling/Retail/Time_Running/TR_MOP_KunLai_Summit.lua

@@ -6,8 +6,6 @@ WoWPro:GuideName(guide,"TR_Kun-Lai Summit")
 WoWPro:GuideNextGuide(guide, 'TR_Townlong Steppes')
 WoWPro:GuideSteps(guide, function()
 return [[
-N It's Chromie Time!|AVAILABLE|62567|M|62.25,29.93|Z|84;Stormwind City|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Hero's Call board in Stormwind. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in Stormwind!|LVL|-60|CT|FACTION|Alliance|
-N It's Chromie Time!|AVAILABLE|62568|M|40.82,80.13|Z|Orgrimmar|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Warchief's Command Board in Orgrimmar. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in  Orgrimmar!|LVL|-60|CT|FACTION|Horde|
 A The Road to Kun-Lai|QID|31254^31255|N|From Messenger Grummle at the foot of The Veiled Stair in Grassy Cline, Valley of the Four Winds.\n(Also available from other NPCs in Krasarang Wilds and Valley of the Four Winds)|M|70,23.57|Z|Valley of the Four Winds|RANK|2|
 C Speak with the Highroad Grummle|QID|31254^31255|CHAT|QO|1|M|70.08,23.47|Z|Valley of the Four Winds|N|Speak with the Highroad Grummle|RANK|2|
 R Path of a Hundred Steps|AVAILABLE|31286|Z|433;The Veiled Stair|N|Head on up the stairs to the Tavern in the Mists via the Path of a Hundred Steps.|M|53.79,87.25|RANK|2|

WoWPro_Leveling/Retail/Time_Running/TR_MOP_Townlong_Steppes.lua

@@ -6,8 +6,6 @@ WoWPro:GuideName(guide,"TR_Townlong Steppes")
 WoWPro:GuideNextGuide(guide, 'Dread Wastes')
 WoWPro:GuideSteps(guide, function()
 return [[
-N It's Chromie Time!|AVAILABLE|62567|M|62.25,29.93|Z|84;Stormwind City|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Hero's Call board in Stormwind. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in Stormwind!|LVL|-60|CT|FACTION|Alliance|
-N It's Chromie Time!|AVAILABLE|62568|M|40.82,80.13|Z|Orgrimmar|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Warchief's Command Board in Orgrimmar. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in  Orgrimmar!|LVL|-60|CT|FACTION|Horde|
 N Welcome to Townlong Steppes|QID|30814|N|This guide starts in Longying Outpost, You may have two lead in qusets to turn in here, if you don't have them, check off those steps and proceed.|
 A Abandoned Crate of Goods|QID|31427|M|62.76,34.08|CC|N|This is guarded by at least one elite lvl 89-90, if you follow close to the wall you can avoid the others. It is inside a burning tent. skip it if you don't think you are up to it.  It gave me and my groupmate each 823K xp. Check this step off manually if you don't do it, (or if it doesn't autocomplete.)|
 R Longying Outpost|QID|30814|CC|M|71.14, 56.47|

WoWPro_Leveling/Retail/Time_Running/TR_MOP_Valley_of_the_Four_Winds.lua

@@ -6,8 +6,6 @@ WoWPro:GuideName(guide,"TR_Valley of the Four Winds")
 WoWPro:GuideNextGuide(guide, 'TR_Krasarang WildsA', 'TR_Krasarang WildsH')
 WoWPro:GuideSteps(guide, function()
 return [[
-N It's Chromie Time!|AVAILABLE|62567|M|62.25,29.93|Z|84;Stormwind City|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Hero's Call board in Stormwind. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in Stormwind!|LVL|-60|CT|FACTION|Alliance|
-N It's Chromie Time!|AVAILABLE|62568|M|40.82,80.13|Z|Orgrimmar|JUMP|Chromie Time|S!US|N|You can now accept Chromie's Call at the Warchief's Command Board in Orgrimmar. This will allow you to choose which expansion you want to level in and scale the content to your level.\n\nYou're free to continue your current guide by skipping this and continuing on, but it won't continue to scale. If you want to enable Chromie Time, click the guide button next to this frame to direct you to Chromie in  Orgrimmar!|LVL|-60|CT|FACTION|Horde|
 R Valley of the Four Winds|N|Make your way to Valley of the Four Winds.|IZ|-376|
 ; -- Breadcrumb quest turn-in
 T Hero's Call: Valley of the Four Winds!|QID|49557|M|85.94,22.10|N|To Chen Stormstout.|