From 0efc354396a40205ce23589055222925c0ee6f77 Mon Sep 17 00:00:00 2001 From: Scott Harrison Date: Sat, 4 Feb 2023 17:46:51 -0500 Subject: [PATCH] Updates some Quest/NPC information for Dragon Isles. Adds ability to deal with group quests with exact counts. --- Grail-NPCs-deDE/Grail-NPCs-_retail_-deDE.lua | 54 ++ Grail-NPCs/Grail-NPCs-_retail_.lua | 291 ++++++++- .../Grail-Quests-_retail_-deDE.lua | 48 ++ .../Grail-Quests-_retail_-enUS.lua | 5 + Grail-Quests/Grail-Quests-_retail_.lua | 572 ++++++++++-------- Grail/Grail.lua | 80 +-- 6 files changed, 735 insertions(+), 315 deletions(-) diff --git a/Grail-NPCs-deDE/Grail-NPCs-_retail_-deDE.lua b/Grail-NPCs-deDE/Grail-NPCs-_retail_-deDE.lua index 8b0a921..eccf7f0 100644 --- a/Grail-NPCs-deDE/Grail-NPCs-_retail_-deDE.lua +++ b/Grail-NPCs-deDE/Grail-NPCs-_retail_-deDE.lua @@ -708,4 +708,58 @@ G[100128231]='Ausstattungsbaupläne: Abgerichtete Haie' G[100128232]='Ausstattungsbaupläne: Hochleistungsnebelleuchten' end +if release >= 47213 then +G[1035591]='Schwimmer' +G[1375642]='Haltegriff' +G[1376034]='Duftende Blüte' +G[1376084]='Weltenbrecherwache' +G[1376102]='Waffe des Weltenbrechers' +G[1376103]="Wu're Kauzfuß" +G[1376426]='Magiegebundene Truhe' +G[1376580]='Depot der Djaradin' +G[1376582]='Kiste der Tuskarr' +G[1376801]='Haufen Treibholz' +G[1376802]='Haufen Treibholz' +G[1376805]='Erneuerter Protodrache' +G[1377055]='Touchytouch-Frostwolf' +G[1377159]="Sàmirâ, Hand von A'dal" +G[1377560]='Windzerzauste Feder' +G[1377955]='Gefülltes Fischernetz' +G[1379314]='Gefülltes Fischernetz' +G[1381069]='Gefülltes Fischernetz' +G[1381070]='Gefülltes Fischernetz' +G[1381190]='Speer der Nokhud' +G[1381191]='Schild der Nokhud' +G[1381192]='Axt der Nokhud' +G[1381249]='Verbände der Tuskarr' +G[1381510]='Knochen fliegender Fische' +G[1381511]='Harpunenspitze' +G[1381512]='Holzstab' +G[1381513]='Alte Spitzhacke' +G[1381584]='Anfrage des Archivars' +G[1381654]='Zerbrochene Angelrute' +G[1381655]='Kuschelentchen' +G[1381668]='Anfrage des Archivars' +G[1381669]='Anfrage des Archivars' +G[1381670]='Anfrage des Archivars' +G[1381738]='Magnetisierte Splitter' +G[1381911]='Entlegenes Fragment' +G[1381972]='Schatz des Herausforderers' +G[1382033]='Vorratsglas der Djaradin' +G[1382193]='Hoss, Champion der Naaru' +G[1382247]='Haltegriff' +G[1382248]='Haltegriff' +G[1382251]='Energieerfüllte Gletscherprobe' +G[1382255]='Haltegriff' +G[1382283]='Triefende Klauendistel' +G[1384405]='Halbgarer Fisch' +end + +if release >= 47631 then +G[1035591]='Grusara' +G[1375642]='Verlorene Vorräte' +G[1376034]='Schlag des Windlords' +G[1381672]='Anfrage des Archivars' +end + -- End of localized NPC names diff --git a/Grail-NPCs/Grail-NPCs-_retail_.lua b/Grail-NPCs/Grail-NPCs-_retail_.lua index 78a9c11..9f6c520 100644 --- a/Grail-NPCs/Grail-NPCs-_retail_.lua +++ b/Grail-NPCs/Grail-NPCs-_retail_.lua @@ -1945,6 +1945,7 @@ G[-790641]={'641:60.00,49.92 N:0'} G[-790634]={'634:7.80,14.61 N:0'} G[-790630]={'630:50.66,82.17 N:0'} G[-790062]={'62:34.97,88.81 N:0'} +G[-782022]={'2022:21.92,50.17 N:0'} G[-781536]={'1536:31.37,59.35 N:0'} G[-781355]={'1355:58.34,48.09 N:0'} G[-780942]={'942:38.66,29.64 N:0'} @@ -1960,6 +1961,7 @@ G[-780641]={'641:91.20,9.60 N:0'} G[-780634]={'634:15.97,98.97 N:0'} G[-780630]={'630:86.72,10.63 N:0'} G[-780062]={'62:44.00,48.18 N:0'} +G[-772022]={'2022:18.35,57.13 N:0'} G[-771536]={'1536:59.43,71.80 N:0'} G[-771355]={'1355:45.63,58.50 N:0'} G[-770942]={'942:42.17,63.34 N:0'} @@ -1975,6 +1977,7 @@ G[-770641]={'641:59.98,31.65 N:0'} G[-770634]={'634:17.36,37.48 N:0'} G[-770630]={'630:76.94,14.00 N:0'} G[-770062]={'62:39.64,32.36 N:0'} +G[-762022]={'2022:53.19,10.47 N:0'} G[-761536]={'1536:67.95,30.33 N:0'} G[-761355]={'1355:34.49,37.93 N:0'} G[-760942]={'942:73.22,67.57 N:0'} @@ -1990,6 +1993,7 @@ G[-760641]={'641:99.80,98.47 N:0'} G[-760634]={'634:15.93,72.17 N:0'} G[-760630]={'630:66.00,39.79 N:0'} G[-760062]={'62:37.80,76.02 N:0'} +G[-752022]={'2022:23.35,84.18 N:0'} G[-751536]={'1536:59.43,71.80 N:0'} G[-751355]={'1355:47.95,61.38 N:0'} G[-750942]={'942:70.81,85.36 N:0'} @@ -2005,6 +2009,7 @@ G[-750641]={'641:56.15,87.36 N:0'} G[-750634]={'634:7.35,64.78 N:0'} G[-750630]={'630:69.36,15.16 N:0'} G[-750062]={'62:43.51,29.11 N:0'} +G[-742022]={'2022:59.76,64.65 N:0'} G[-741536]={'1536:67.95,30.33 N:0'} G[-741525]={'1525:46.11,41.72 N:0'} G[-741355]={'1355:28.16,26.74 N:0'} @@ -2021,6 +2026,7 @@ G[-740641]={'641:46.61,69.91 N:0'} G[-740634]={'634:72.98,69.46 N:0'} G[-740630]={'630:92.79,17.94 N:0'} G[-740062]={'62:38.30,76.26 N:0'} +G[-732022]={'2022:15.49,48.39 N:0'} G[-731536]={'1536:45.03,66.59 N:0'} G[-731525]={'1525:27.01,14.43 N:0'} G[-731355]={'1355:48.09,61.20 N:0'} @@ -2037,6 +2043,7 @@ G[-730641]={'641:73.54,76.74 N:0'} G[-730634]={'634:28.60,85.33 N:0'} G[-730630]={'630:87.08,10.54 N:0'} G[-730062]={'62:61.04,18.33 N:0'} +G[-722022]={'2022:48.43,52.19 N:0'} G[-721536]={'1536:43.97,33.25 N:0'} G[-721525]={'1525:35.43,32.10 N:0'} G[-721355]={'1355:59.07,26.57 N:0'} @@ -2053,6 +2060,7 @@ G[-720641]={'641:54.70,73.25 N:0'} G[-720634]={'634:7.12,42.19 N:0'} G[-720630]={'630:79.78,9.52 N:0'} G[-720062]={'62:43.65,53.45 N:0'} +G[-712022]={'2022:69.59,9.56 N:0'} G[-711565]={'1565:67.12,35.07 N:0'} G[-711536]={'1536:60.49,71.68 N:0'} G[-711525]={'1525:61.07,41.24 N:0'} @@ -2070,6 +2078,7 @@ G[-710641]={'641:99.76,70.23 N:0'} G[-710634]={'634:15.79,99.21 N:0'} G[-710630]={'630:89.43,11.77 N:0'} G[-710062]={'62:45.32,58.72 N:0'} +G[-702022]={'2022:38.92,83.31 N:0'} G[-701565]={'1565:63.91,38.29 N:0'} G[-701536]={'1536:51.33,18.61 N:0'} G[-701525]={'1525:58.78,43.74 N:0'} @@ -2088,6 +2097,7 @@ G[-700641]={'641:90.72,62.45 N:0'} G[-700634]={'634:56.88,46.06 N:0'} G[-700630]={'630:43.36,8.36 N:0'} G[-700062]={'62:41.48,76.51 N:0'} +G[-692022]={'2022:79.00,30.26 N:0'} G[-691565]={'1565:24.52,59.92 N:0'} G[-691536]={'1536:37.68,48.85 N:0'} G[-691525]={'1525:68.82,62.03 N:0'} @@ -2106,6 +2116,7 @@ G[-690641]={'641:77.91,71.54 N:0'} G[-690634]={'634:54.80,45.42 N:0'} G[-690630]={'630:49.51,8.65 N:0'} G[-690062]={'62:38.30,76.26 N:0'} +G[-682022]={'2022:24.07,36.60 N:0'} G[-681565]={'1565:51.09,44.17 N:0'} G[-681536]={'1536:76.26,55.11 N:0'} G[-681525]={'1525:31.32,57.41 N:0'} @@ -2124,6 +2135,7 @@ G[-680641]={'641:74.10,54.17 N:0'} G[-680634]={'634:40.58,72.20 N:0'} G[-680630]={'630:53.28,43.77 N:0'} G[-680062]={'62:40.97,35.89 N:0'} +G[-672022]={'2022:29.24,33.87 N:0'} G[-671565]={'1565:51.09,44.17 N:0'} G[-671536]={'1536:58.72,74.56 N:0'} G[-671525]={'1525:32.68,48.97 N:0'} @@ -2142,6 +2154,7 @@ G[-670641]={'641:90.49,38.65 N:0'} G[-670634]={'634:62.59,80.52 N:0'} G[-670630]={'630:62.01,40.97 N:0'} G[-670062]={'62:45.32,74.77 N:0'} +G[-662022]={'2022:52.54,21.83 N:0'} G[-661565]={'1565:37.04,28.18 N:0'} G[-661536]={'1536:50.24,53.25 N:0'} G[-661525]={'1525:57.66,55.66 N:0'} @@ -2160,6 +2173,7 @@ G[-660641]={'641:99.62,98.71 N:0'} G[-660634]={'634:7.02,42.34 N:0'} G[-660630]={'630:78.83,57.25 N:0'} G[-660062]={'62:40.82,56.19 N:0'} +G[-652022]={'2022:16.42,50.12 N:0'} G[-651565]={'1565:68.38,57.40 N:0'} G[-651536]={'1536:64.43,34.87 N:0'} G[-651533]={'1533:54.39,56.06 N:0'} @@ -2179,6 +2193,7 @@ G[-650641]={'641:72.27,81.40 N:0'} G[-650634]={'634:16.21,99.10 N:0'} G[-650630]={'630:86.79,10.43 N:0'} G[-650062]={'62:50.50,32.13 N:0'} +G[-642022]={'2022:18.07,35.89 N:0'} G[-641565]={'1565:55.99,55.30 N:0'} G[-641536]={'1536:50.24,53.25 N:0'} G[-641533]={'1533:54.39,56.06 N:0'} @@ -2199,6 +2214,7 @@ G[-640641]={'641:90.38,38.81 N:0'} G[-640634]={'634:7.92,97.94 N:0'} G[-640630]={'630:92.74,17.94 N:0'} G[-640062]={'62:36.80,83.03 N:0'} +G[-632022]={'2022:47.08,85.57 N:0'} G[-631565]={'1565:56.34,55.72 N:0'} G[-631536]={'1536:53.48,58.33 N:0'} G[-631533]={'1533:53.07,32.74 N:0'} @@ -2219,6 +2235,7 @@ G[-630641]={'641:91.32,97.38 N:0'} G[-630634]={'634:83.92,9.00 N:0'} G[-630630]={'630:55.09,29.50 N:0'} G[-630062]={'62:40.48,84.28 N:0'} +G[-622022]={'2022:10.63,24.12 N:0'} G[-621565]={'1565:39.59,55.62 N:0'} G[-621536]={'1536:53.79,47.80 N:0'} G[-621533]={'1533:35.95,48.24 N:0'} @@ -2239,6 +2256,8 @@ G[-620641]={'641:47.77,95.99 N:0'} G[-620634]={'634:22.20,19.16 N:0'} G[-620630]={'630:84.76,14.66 N:0'} G[-620062]={'62:43.65,28.86 N:0'} +G[-612023]={'2023:84.42,55.32 N:0'} +G[-612022]={'2022:32.75,52.53 N:0'} G[-611565]={'1565:48.33,51.27 N:0'} G[-611536]={'1536:32.06,66.99 N:0'} G[-611533]={'1533:56.07,62.00 N:0'} @@ -2260,6 +2279,8 @@ G[-610634]={'634:77.08,54.05 N:0'} G[-610630]={'630:84.70,14.62 N:0'} G[-610062]={'62:38.47,76.26 N:0'} G[-610014]={'14:51.16,40.08 N:0'} +G[-602023]={'2023:72.68,84.48 N:0'} +G[-602022]={'2022:79.13,42.77 N:0'} G[-601565]={'1565:68.45,25.87 N:0'} G[-601536]={'1536:32.06,66.99 N:0'} G[-601533]={'1533:55.89,86.47 N:0'} @@ -2281,6 +2302,8 @@ G[-600634]={'634:30.41,82.54 N:0'} G[-600630]={'630:78.84,57.22 N:0'} G[-600062]={'62:45.49,58.46 N:0'} G[-600014]={'14:50.99,36.50 N:0'} +G[-592023]={'2023:53.71,51.60 N:0'} +G[-592022]={'2022:22.73,94.96 N:0'} G[-591565]={'1565:48.33,51.27 N:0'} G[-591536]={'1536:53.79,47.80 N:0'} G[-591533]={'1533:52.43,46.53 N:0'} @@ -2302,6 +2325,8 @@ G[-590634]={'634:41.63,34.07 N:0'} G[-590630]={'630:30.76,45.43 N:0'} G[-590062]={'62:46.32,85.79 N:0'} G[-590014]={'14:50.99,36.50 N:0'} +G[-582023]={'2023:53.17,37.33 N:0'} +G[-582022]={'2022:42.19,67.45 N:0'} G[-581565]={'1565:51.79,76.41 N:0'} G[-581536]={'1536:37.46,67.87 N:0'} G[-581533]={'1533:34.07,66.55 N:0'} @@ -2324,6 +2349,8 @@ G[-580634]={'634:4.56,42.13 N:0'} G[-580630]={'630:37.24,43.02 N:0'} G[-580062]={'62:43.65,53.19 N:0'} G[-580014]={'14:30.71,44.82 N:0'} +G[-572023]={'2023:28.01,68.03 N:0'} +G[-572022]={'2022:48.55,46.08 N:0'} G[-571565]={'1565:20.01,63.35 N:0'} G[-571536]={'1536:31.89,26.75 N:0'} G[-571533]={'1533:52.65,82.61 N:0'} @@ -2346,6 +2373,8 @@ G[-570634]={'634:3.64,13.86 N:0'} G[-570630]={'630:63.51,41.06 N:0'} G[-570062]={'62:47.82,55.45 N:0'} G[-570014]={'14:79.35,29.12 N:0'} +G[-562023]={'2023:86.31,35.81 N:0'} +G[-562022]={'2022:5.45,55.54 N:0'} G[-561565]={'1565:32.63,55.66 N:0'} G[-561536]={'1536:58.05,63.35 N:0'} G[-561533]={'1533:53.72,75.03 N:0'} @@ -2368,6 +2397,8 @@ G[-560634]={'634:15.88,98.97 N:0'} G[-560630]={'630:86.87,10.54 N:0'} G[-560062]={'62:40.82,84.79 N:0'} G[-560014]={'14:19.78,62.59 N:0'} +G[-552023]={'2023:36.07,39.05 N:0'} +G[-552022]={'2022:56.17,19.12 N:0'} G[-551565]={'1565:20.01,63.35 N:0'} G[-551536]={'1536:37.64,46.44 N:0'} G[-551533]={'1533:52.43,46.53 N:0'} @@ -2390,6 +2421,8 @@ G[-550634]={'634:51.90,33.40 N:0'} G[-550630]={'630:98.28,14.87 N:0'} G[-550062]={'62:43.82,48.67 N:0'} G[-550014]={'14:27.46,56.94 N:0'} +G[-542023]={'2023:15.71,69.69 N:0'} +G[-542022]={'2022:26.18,92.39 N:0'} G[-541565]={'1565:69.01,26.71 N:0'} G[-541536]={'1536:69.54,50.23 N:0'} G[-541533]={'1533:40.14,62.27 N:0'} @@ -2412,6 +2445,8 @@ G[-540634]={'634:5.57,83.91 N:0'} G[-540630]={'630:53.28,16.17 N:0'} G[-540062]={'62:33.62,84.05 N:0'} G[-540014]={'14:48.77,39.86 N:0'} +G[-532023]={'2023:79.21,76.98 N:0'} +G[-532022]={'2022:3.61,25.35 N:0'} G[-531565]={'1565:69.44,56.61 N:0'} G[-531536]={'1536:52.84,68.28 N:0'} G[-531533]={'1533:59.53,58.85 N:0'} @@ -2434,6 +2469,8 @@ G[-530634]={'634:78.51,57.26 N:0'} G[-530630]={'630:46.91,41.43 N:0'} G[-530062]={'62:43.82,58.21 N:0'} G[-530014]={'14:50.44,57.55 N:0'} +G[-522023]={'2023:5.75,5.91 N:0'} +G[-522022]={'2022:47.19,16.43 N:0'} G[-521565]={'1565:51.51,83.91 N:0'} G[-521536]={'1536:58.46,74.09 N:0'} G[-521533]={'1533:57.90,75.79 N:0'} @@ -2456,6 +2493,8 @@ G[-520634]={'634:56.12,40.92 N:0'} G[-520630]={'630:84.71,14.62 N:0'} G[-520062]={'62:58.51,24.33 N:0'} G[-520014]={'14:48.77,39.86 N:0'} +G[-512023]={'2023:45.93,20.84 N:0'} +G[-512022]={'2022:70.83,11.87 N:0'} G[-511970]={'1970:80.31,53.44 N:0'} G[-511565]={'1565:45.24,64.78 N:0'} G[-511536]={'1536:34.83,76.04 N:0'} @@ -2479,6 +2518,8 @@ G[-510634]={'634:15.97,99.10 N:0'} G[-510630]={'630:88.22,22.79 N:0'} G[-510062]={'62:61.41,9.21 N:0'} G[-510014]={'14:62.06,31.45 N:0'} +G[-502023]={'2023:52.00,57.00 N:0'} +G[-502022]={'2022:49.79,68.35 N:0'} G[-501970]={'1970:58.40,49.83 N:0'} G[-501565]={'1565:55.78,26.36 N:0'} G[-501536]={'1536:50.62,65.42 N:0'} @@ -2502,6 +2543,8 @@ G[-500634]={'634:4.90,69.28 N:0'} G[-500630]={'630:92.73,17.87 N:0'} G[-500062]={'62:35.62,81.78 N:0'} G[-500014]={'14:12.02,52.07 N:0'} +G[-492023]={'2023:24.94,31.73 N:0'} +G[-492022]={'2022:2.73,57.57 N:0'} G[-491970]={'1970:58.36,50.01 N:0'} G[-491565]={'1565:49.34,52.36 N:0'} G[-491536]={'1536:76.46,55.40 N:0'} @@ -2525,6 +2568,8 @@ G[-490634]={'634:54.76,45.42 N:0'} G[-490630]={'630:49.93,41.52 N:0'} G[-490062]={'62:62.20,9.30 N:0'} G[-490014]={'14:56.91,34.65 N:0'} +G[-482023]={'2023:25.80,55.01 N:0'} +G[-482022]={'2022:86.60,3.72 N:0'} G[-481970]={'1970:58.32,50.01 N:0'} G[-481565]={'1565:63.11,53.12 N:0'} G[-481536]={'1536:50.27,65.85 N:0'} @@ -2548,6 +2593,8 @@ G[-480634]={'634:12.40,37.69 N:0'} G[-480630]={'630:87.08,10.20 N:0'} G[-480062]={'62:38.14,44.91 N:0'} G[-480014]={'14:19.32,61.04 N:0'} +G[-472023]={'2023:81.18,72.23 N:0'} +G[-472022]={'2022:40.10,85.51 N:0'} G[-471970]={'1970:65.67,40.84 N:0'} G[-471961]={'1961:68.14,89.31 N:0'} G[-471565]={'1565:62.96,39.40 N:0'} @@ -2572,6 +2619,9 @@ G[-470634]={'634:39.28,53.30 N:0'} G[-470630]={'630:63.04,41.06 N:0'} G[-470062]={'62:67.22,18.58 N:0'} G[-470014]={'14:63.47,68.84 N:0'} +G[-462024]={'2024:87.14,98.18 N:0'} +G[-462023]={'2023:24.46,99.68 N:0'} +G[-462022]={'2022:60.70,48.77 N:0'} G[-461970]={'1970:55.28,64.40 N:0'} G[-461961]={'1961:68.28,89.42 N:0'} G[-461565]={'1565:63.77,47.01 N:0'} @@ -2596,6 +2646,10 @@ G[-460634]={'634:84.94,11.43 N:0'} G[-460630]={'630:51.30,41.63 N:0'} G[-460062]={'62:69.22,19.07 N:0'} G[-460014]={'14:21.34,21.71 N:0'} +G[-452025]={'2025:84.18,75.63 N:0'} +G[-452024]={'2024:47.67,79.27 N:0'} +G[-452023]={'2023:83.54,76.46 N:0'} +G[-452022]={'2022:37.02,33.28 N:0'} G[-451970]={'1970:35.75,59.06 N:0'} G[-451961]={'1961:68.48,90.25 N:0'} G[-451565]={'1565:60.17,32.66 N:0'} @@ -2620,6 +2674,10 @@ G[-450634]={'634:72.95,69.56 N:0'} G[-450630]={'630:88.99,32.46 N:0'} G[-450062]={'62:52.31,32.13 N:0'} G[-450014]={'14:48.49,77.34 N:0'} +G[-442025]={'2025:93.87,96.51 N:0'} +G[-442024]={'2024:12.15,33.67 N:0'} +G[-442023]={'2023:61.96,41.59 N:0'} +G[-442022]={'2022:54.67,58.92 N:0'} G[-441970]={'1970:55.61,49.98 N:0'} G[-441961]={'1961:68.24,90.14 N:0'} G[-441565]={'1565:55.97,27.22 N:0'} @@ -2644,6 +2702,10 @@ G[-440634]={'634:38.34,27.17 N:0'} G[-440630]={'630:37.11,83.51 N:0'} G[-440062]={'62:40.48,82.54 N:0'} G[-440014]={'14:19.78,62.59 N:0'} +G[-432025]={'2025:90.74,58.54 N:0'} +G[-432024]={'2024:51.37,24.87 N:0'} +G[-432023]={'2023:18.11,13.78 N:0'} +G[-432022]={'2022:73.12,34.17 N:0'} G[-431970]={'1970:52.47,57.02 N:0'} G[-431961]={'1961:68.09,90.00 N:0'} G[-431565]={'1565:40.22,28.90 N:0'} @@ -2669,6 +2731,10 @@ G[-430634]={'634:15.93,46.99 N:0'} G[-430630]={'630:86.79,10.54 N:0'} G[-430062]={'62:37.97,76.02 N:0'} G[-430014]={'14:30.71,44.82 N:0'} +G[-422025]={'2025:54.33,39.32 N:0'} +G[-422024]={'2024:91.35,82.24 N:0'} +G[-422023]={'2023:43.56,66.31 N:0'} +G[-422022]={'2022:35.52,29.41 N:0'} G[-421970]={'1970:59.03,32.73 N:0'} G[-421961]={'1961:67.80,87.10 N:0'} G[-421565]={'1565:45.17,73.26 N:0'} @@ -2694,6 +2760,10 @@ G[-420634]={'634:16.21,98.72 N:0'} G[-420630]={'630:43.28,56.06 N:0'} G[-420062]={'62:61.04,18.58 N:0'} G[-420014]={'14:21.34,21.97 N:0'} +G[-412025]={'2025:88.18,71.81 N:0'} +G[-412024]={'2024:34.20,46.79 N:0'} +G[-412023]={'2023:44.56,21.97 N:0'} +G[-412022]={'2022:75.57,45.12 N:0'} G[-411970]={'1970:48.82,86.68 N:0'} G[-411961]={'1961:68.11,87.43 N:0'} G[-411565]={'1565:47.93,25.22 N:0'} @@ -2719,6 +2789,10 @@ G[-410634]={'634:17.81,37.48 N:0'} G[-410630]={'630:65.61,41.02 N:0'} G[-410062]={'62:54.34,8.79 N:0'} G[-410014]={'14:29.88,60.00 N:0'} +G[-402025]={'2025:56.27,49.25 N:0'} +G[-402024]={'2024:19.00,35.89 N:0'} +G[-402023]={'2023:81.57,78.08 N:0'} +G[-402022]={'2022:33.73,64.54 N:0'} G[-401970]={'1970:53.62,87.47 N:0'} G[-401961]={'1961:67.99,88.66 N:0'} G[-401565]={'1565:72.90,35.39 N:0'} @@ -2744,6 +2818,10 @@ G[-400634]={'634:51.42,55.34 N:0'} G[-400630]={'630:96.98,14.75 N:0'} G[-400062]={'62:49.50,24.84 N:0'} G[-400014]={'14:65.31,70.79 N:0'} +G[-392025]={'2025:90.65,84.40 N:0'} +G[-392024]={'2024:47.92,24.51 N:0'} +G[-392023]={'2023:35.58,38.68 N:0'} +G[-392022]={'2022:78.18,11.93 N:0'} G[-391970]={'1970:61.42,49.16 N:0'} G[-391961]={'1961:68.19,88.77 N:0'} G[-391565]={'1565:27.11,48.46 N:0'} @@ -2769,6 +2847,10 @@ G[-390634]={'634:39.89,28.20 N:0'} G[-390630]={'630:61.39,43.12 N:0'} G[-390062]={'62:41.82,76.77 N:0'} G[-390014]={'14:46.24,52.07 N:0'} +G[-382025]={'2025:99.23,10.69 N:0'} +G[-382024]={'2024:86.39,81.73 N:0'} +G[-382023]={'2023:2.33,83.90 N:0'} +G[-382022]={'2022:55.07,77.77 N:0'} G[-381970]={'1970:43.50,27.39 N:0'} G[-381961]={'1961:70.53,90.40 N:0'} G[-381565]={'1565:51.08,44.17 N:0'} @@ -2794,6 +2876,11 @@ G[-380634]={'634:62.26,57.26 N:0'} G[-380630]={'630:56.41,66.79 N:0'} G[-380062]={'62:43.32,19.32 N:0'} G[-380014]={'14:57.37,44.39 N:0'} +G[-372112]={'2112:38.41,62.79 N:0'} +G[-372025]={'2025:67.06,84.38 N:0'} +G[-372024]={'2024:44.84,98.08 N:0'} +G[-372023]={'2023:25.93,98.46 N:0'} +G[-372022]={'2022:23.23,11.86 N:0'} G[-371970]={'1970:47.57,59.48 N:0'} G[-371961]={'1961:67.97,90.14 N:0'} G[-371565]={'1565:51.82,75.68 N:0'} @@ -2819,6 +2906,11 @@ G[-370634]={'634:73.50,40.61 N:0'} G[-370630]={'630:59.18,41.73 N:0'} G[-370062]={'62:47.48,44.66 N:0'} G[-370014]={'14:62.90,81.09 N:0'} +G[-362112]={'2112:39.40,70.16 N:0'} +G[-362025]={'2025:58.66,0.05 N:0'} +G[-362024]={'2024:35.00,94.89 N:0'} +G[-362023]={'2023:24.17,95.29 N:0'} +G[-362022]={'2022:43.46,18.27 N:0'} G[-361970]={'1970:44.07,37.11 N:0'} G[-361961]={'1961:68.02,90.14 N:0'} G[-361565]={'1565:51.82,75.68 N:0'} @@ -2844,6 +2936,11 @@ G[-360634]={'634:15.88,99.10 N:0'} G[-360630]={'630:44.88,83.47 N:0'} G[-360062]={'62:44.65,43.91 N:0'} G[-360014]={'14:62.12,31.45 N:0'} +G[-352112]={'2112:42.00,40.42 N:0'} +G[-352025]={'2025:39.46,73.59 N:0'} +G[-352024]={'2024:17.57,26.74 N:0'} +G[-352023]={'2023:23.98,7.30 N:0'} +G[-352022]={'2022:73.40,21.24 N:0'} G[-351970]={'1970:61.32,51.53 N:0'} G[-351961]={'1961:68.21,89.27 N:0'} G[-351565]={'1565:43.67,23.98 N:0'} @@ -2869,6 +2966,11 @@ G[-350634]={'634:17.71,37.48 N:0'} G[-350630]={'630:32.25,29.67 N:0'} G[-350062]={'62:50.83,31.87 N:0'} G[-350014]={'14:18.69,28.22 N:0'} +G[-342112]={'2112:50.14,56.21 N:0'} +G[-342025]={'2025:37.68,49.23 N:0'} +G[-342024]={'2024:20.97,22.80 N:0'} +G[-342023]={'2023:9.79,72.36 N:0'} +G[-342022]={'2022:64.33,59.24 N:0'} G[-341970]={'1970:63.10,37.38 N:0'} G[-341961]={'1961:68.33,89.42 N:0'} G[-341565]={'1565:39.47,56.71 N:0'} @@ -2894,6 +2996,11 @@ G[-340634]={'634:10.12,27.53 N:0'} G[-340630]={'630:57.20,16.72 N:0'} G[-340062]={'62:37.65,84.54 N:0'} G[-340014]={'14:14.55,36.59 N:0'} +G[-332112]={'2112:38.78,58.49 N:0'} +G[-332025]={'2025:38.42,68.86 N:0'} +G[-332024]={'2024:44.22,60.92 N:0'} +G[-332023]={'2023:18.16,1.87 N:0'} +G[-332022]={'2022:14.11,91.58 N:0'} G[-331970]={'1970:56.72,45.91 N:0'} G[-331961]={'1961:68.16,89.20 N:0'} G[-331565]={'1565:38.70,28.69 N:0'} @@ -2920,6 +3027,11 @@ G[-330634]={'634:66.20,47.78 N:0'} G[-330630]={'630:60.61,71.54 N:0'} G[-330062]={'62:58.19,23.85 N:0'} G[-330014]={'14:42.73,56.42 N:0'} +G[-322112]={'2112:39.96,60.77 N:0'} +G[-322025]={'2025:56.83,67.40 N:0'} +G[-322024]={'2024:29.26,96.15 N:0'} +G[-322023]={'2023:43.79,34.46 N:0'} +G[-322022]={'2022:42.54,94.40 N:0'} G[-321970]={'1970:61.38,51.56 N:0'} G[-321961]={'1961:68.11,90.72 N:0'} G[-321565]={'1565:47.93,25.22 N:0'} @@ -2946,6 +3058,11 @@ G[-320634]={'634:48.45,21.25 N:0'} G[-320630]={'630:67.27,26.95 N:0'} G[-320062]={'62:41.65,76.51 N:0'} G[-320014]={'14:57.29,54.31 N:0'} +G[-312112]={'2112:41.93,40.42 N:0'} +G[-312025]={'2025:44.95,51.93 N:0'} +G[-312024]={'2024:42.79,84.93 N:0'} +G[-312023]={'2023:69.88,38.02 N:0'} +G[-312022]={'2022:48.73,36.97 N:0'} G[-311970]={'1970:32.22,52.62 N:0'} G[-311961]={'1961:66.79,91.77 N:0'} G[-311565]={'1565:68.46,25.87 N:0'} @@ -2972,6 +3089,11 @@ G[-310634]={'634:38.74,54.78 N:0'} G[-310630]={'630:46.00,16.07 N:0'} G[-310062]={'62:40.14,61.48 N:0'} G[-310014]={'14:52.02,76.65 N:0'} +G[-302112]={'2112:38.77,58.49 N:0'} +G[-302025]={'2025:57.21,66.89 N:0'} +G[-302024]={'2024:49.03,18.69 N:0'} +G[-302023]={'2023:8.28,67.91 N:0'} +G[-302022]={'2022:23.85,54.09 N:0'} G[-301970]={'1970:47.39,90.60 N:0'} G[-301961]={'1961:66.74,91.63 N:0'} G[-301565]={'1565:45.29,55.37 N:0'} @@ -2998,6 +3120,11 @@ G[-300634]={'634:55.41,42.60 N:0'} G[-300630]={'630:51.14,37.12 N:0'} G[-300062]={'62:39.47,33.13 N:0'} G[-300014]={'14:25.16,48.49 N:0'} +G[-292112]={'2112:68.45,96.13 N:0'} +G[-292025]={'2025:59.83,82.24 N:0'} +G[-292024]={'2024:58.34,66.32 N:0'} +G[-292023]={'2023:26.60,82.64 N:0'} +G[-292022]={'2022:42.46,9.65 N:0'} G[-291970]={'1970:55.24,47.70 N:0'} G[-291961]={'1961:67.95,88.04 N:0'} G[-291565]={'1565:44.35,51.98 N:0'} @@ -3024,6 +3151,11 @@ G[-290634]={'634:44.20,67.64 N:0'} G[-290630]={'630:54.30,44.40 N:0'} G[-290062]={'62:57.00,15.31 N:0'} G[-290014]={'14:49.06,84.20 N:0'} +G[-282112]={'2112:36.84,61.37 N:0'} +G[-282025]={'2025:93.10,68.88 N:0'} +G[-282024]={'2024:48.08,41.11 N:0'} +G[-282023]={'2023:43.63,49.21 N:0'} +G[-282022]={'2022:23.09,19.04 N:0'} G[-281970]={'1970:57.85,70.53 N:0'} G[-281961]={'1961:68.02,87.03 N:0'} G[-281565]={'1565:40.22,28.90 N:0'} @@ -3050,6 +3182,11 @@ G[-280634]={'634:74.17,88.98 N:0'} G[-280630]={'630:65.69,48.40 N:0'} G[-280062]={'62:39.15,61.71 N:0'} G[-280014]={'14:47.62,77.99 N:0'} +G[-272112]={'2112:68.46,96.13 N:0'} +G[-272025]={'2025:77.45,5.76 N:0'} +G[-272024]={'2024:87.99,73.37 N:0'} +G[-272023]={'2023:18.60,95.07 N:0'} +G[-272022]={'2022:44.38,18.29 N:0'} G[-271970]={'1970:45.08,60.15 N:0'} G[-271961]={'1961:69.35,90.29 N:0'} G[-271565]={'1565:51.58,70.39 N:0'} @@ -3077,6 +3214,11 @@ G[-270634]={'634:61.87,90.26 N:0'} G[-270630]={'630:64.19,19.32 N:0'} G[-270062]={'62:36.47,82.80 N:0'} G[-270014]={'14:62.06,31.45 N:0'} +G[-262112]={'2112:68.48,96.17 N:0'} +G[-262025]={'2025:76.28,87.80 N:0'} +G[-262024]={'2024:74.63,23.96 N:0'} +G[-262023]={'2023:44.29,17.90 N:0'} +G[-262022]={'2022:27.91,29.16 N:0'} G[-261970]={'1970:34.29,47.73 N:0'} G[-261961]={'1961:67.15,92.21 N:0'} G[-261565]={'1565:56.47,25.94 N:0'} @@ -3104,6 +3246,11 @@ G[-260634]={'634:59.87,42.16 N:0'} G[-260630]={'630:56.26,16.53 N:0'} G[-260062]={'62:41.14,35.89 N:0'} G[-260014]={'14:35.63,64.19 N:0'} +G[-252112]={'2112:69.95,99.02 N:0'} +G[-252025]={'2025:58.20,37.01 N:0'} +G[-252024]={'2024:16.54,49.43 N:0'} +G[-252023]={'2023:3.21,69.17 N:0'} +G[-252022]={'2022:32.66,21.16 N:0'} G[-251970]={'1970:64.33,35.04 N:0'} G[-251961]={'1961:69.44,90.58 N:0'} G[-251565]={'1565:39.14,56.71 N:0'} @@ -3131,6 +3278,11 @@ G[-250634]={'634:60.90,68.12 N:0'} G[-250630]={'630:48.27,25.15 N:0'} G[-250062]={'62:57.35,15.57 N:0'} G[-250014]={'14:67.55,60.91 N:0'} +G[-242112]={'2112:38.75,58.54 N:0'} +G[-242025]={'2025:60.22,42.00 N:0'} +G[-242024]={'2024:48.19,37.20 N:0'} +G[-242023]={'2023:38.37,26.42 N:0'} +G[-242022]={'2022:18.67,28.52 N:0'} G[-241970]={'1970:38.34,70.32 N:0'} G[-241961]={'1961:68.07,88.88 N:0'} G[-241565]={'1565:52.30,39.74 N:0'} @@ -3159,6 +3311,11 @@ G[-240634]={'634:69.19,45.91 N:0'} G[-240630]={'630:56.91,63.49 N:0'} G[-240062]={'62:56.52,30.37 N:0'} G[-240014]={'14:46.24,52.07 N:0'} +G[-232112]={'2112:38.26,57.97 N:0'} +G[-232025]={'2025:59.59,30.31 N:0'} +G[-232024]={'2024:58.19,42.50 N:0'} +G[-232023]={'2023:3.61,79.86 N:0'} +G[-232022]={'2022:66.23,64.14 N:0'} G[-231970]={'1970:56.48,83.98 N:0'} G[-231961]={'1961:68.28,90.32 N:0'} G[-231565]={'1565:60.45,31.84 N:0'} @@ -3189,6 +3346,11 @@ G[-230630]={'630:35.36,50.36 N:0'} G[-230627]={'627:8.30,32.68 N:0'} G[-230062]={'62:44.00,80.78 N:0'} G[-230014]={'14:50.18,40.55 N:0'} +G[-222112]={'2112:98.11,26.90 N:0'} +G[-222025]={'2025:94.86,60.38 N:0'} +G[-222024]={'2024:86.79,99.96 N:0'} +G[-222023]={'2023:39.11,17.69 N:0'} +G[-222022]={'2022:42.95,58.11 N:0'} G[-221970]={'1970:47.57,39.05 N:0'} G[-221961]={'1961:69.97,88.40 N:0'} G[-221565]={'1565:27.69,58.43 N:0'} @@ -3219,6 +3381,11 @@ G[-220630]={'630:32.62,54.44 N:0'} G[-220627]={'627:79.43,60.30 N:0'} G[-220062]={'62:57.35,15.31 N:0'} G[-220014]={'14:26.74,32.70 N:0'} +G[-212112]={'2112:68.43,96.19 N:0'} +G[-212025]={'2025:57.73,75.16 N:0'} +G[-212024]={'2024:40.95,59.38 N:0'} +G[-212023]={'2023:46.55,6.13 N:0'} +G[-212022]={'2022:11.40,33.59 N:0'} G[-211970]={'1970:62.98,58.54 N:0'} G[-211961]={'1961:67.56,87.03 N:0'} G[-211565]={'1565:41.85,45.62 N:0'} @@ -3250,6 +3417,11 @@ G[-210627]={'627:33.57,47.33 N:0'} G[-210543]={'543:59.62,33.29 N:0'} G[-210062]={'62:33.19,83.26 N:0'} G[-210014]={'14:53.32,57.55 N:0'} +G[-202112]={'2112:42.07,40.62 N:0'} +G[-202025]={'2025:39.62,76.11 N:0'} +G[-202024]={'2024:29.51,28.52 N:0'} +G[-202023]={'2023:59.96,35.65 N:0'} +G[-202022]={'2022:16.12,52.61 N:0'} G[-201970]={'1970:49.05,4.07 N:0'} G[-201961]={'1961:67.63,87.06 N:0'} G[-201565]={'1565:39.83,64.42 N:0'} @@ -3281,6 +3453,11 @@ G[-200627]={'627:28.59,22.18 N:0'} G[-200543]={'543:68.63,34.22 N:0'} G[-200062]={'62:50.86,19.08 N:0'} G[-200014]={'14:52.97,60.05 N:0'} +G[-192112]={'2112:66.00,99.78 N:0'} +G[-192025]={'2025:58.81,58.79 N:0'} +G[-192024]={'2024:59.94,87.49 N:0'} +G[-192023]={'2023:25.17,3.54 N:0'} +G[-192022]={'2022:3.22,49.07 N:0'} G[-191970]={'1970:57.39,65.61 N:0'} G[-191961]={'1961:68.86,89.85 N:0'} G[-191565]={'1565:51.01,37.43 N:0'} @@ -3312,6 +3489,11 @@ G[-190627]={'627:28.71,22.91 N:0'} G[-190543]={'543:57.00,35.88 N:0'} G[-190062]={'62:32.71,84.62 N:0'} G[-190014]={'14:79.35,29.12 N:0'} +G[-182112]={'2112:67.80,95.47 N:0'} +G[-182025]={'2025:51.17,42.33 N:0'} +G[-182024]={'2024:33.84,47.41 N:0'} +G[-182023]={'2023:73.73,71.93 N:0'} +G[-182022]={'2022:22.99,23.86 N:0'} G[-181970]={'1970:61.26,51.59 N:0'} G[-181961]={'1961:67.12,92.86 N:0'} G[-181565]={'1565:62.41,23.77 N:0'} @@ -3344,7 +3526,11 @@ G[-180543]={'543:46.38,92.46 N:0'} G[-180542]={'542:37,44 N:0'} G[-180062]={'62:38.01,26.91 N:0'} G[-180014]={'14:27.41,31.50 N:0'} +G[-172112]={'2112:38.79,58.52 N:0'} +G[-172025]={'2025:59.44,76.31 N:0'} +G[-172024]={'2024:71.35,25.09 N:0'} G[-172023]={'2023:47.61,70.94 N:0'} +G[-172022]={'2022:28.22,44.02 N:0'} G[-171970]={'1970:33.74,49.37 N:0'} G[-171961]={'1961:67.46,87.50 N:0'} G[-171565]={'1565:52.58,59.74 N:0'} @@ -3377,7 +3563,11 @@ G[-170543]={'543:43.10,65.92 N:0'} G[-170542]={'542:71.80,34.57 N:0'} G[-170062]={'62:43.94,75.97 N:0'} G[-170014]={'14:61.89,31.07 N:0'} +G[-162112]={'2112:41.79,40.73 N:0'} +G[-162025]={'2025:56.34,28.86 N:0'} +G[-162024]={'2024:28.40,45.04 N:0'} G[-162023]={'2023:24.41,42.36 N:0'} +G[-162022]={'2022:70.42,15.20 N:0'} G[-161970]={'1970:61.32,51.41 N:0'} G[-161961]={'1961:66.64,92.17 N:0'} G[-161565]={'1565:58.12,56.94 N:0'} @@ -3412,7 +3602,11 @@ G[-160542]={'542:60.45,12.34 N:0'} G[-160525]={'525:55,43 N:0'} G[-160062]={'62:42.08,66.86 N:0'} G[-160014]={'14:32.93,38.53 N:0'} +G[-152112]={'2112:28.53,60.32 N:0'} +G[-152025]={'2025:95.66,75.21 N:0'} +G[-152024]={'2024:48.44,35.96 N:0'} G[-152023]={'2023:10.90,84.24 N:0'} +G[-152022]={'2022:56.36,64.89 N:0'} G[-151970]={'1970:57.15,31.46 N:0'} G[-151961]={'1961:70.51,90.58 N:0'} G[-151565]={'1565:46.46,50.68 N:0'} @@ -3448,8 +3642,11 @@ G[-150539]={'539:50.41,89.60 N:0'} G[-150525]={'525:49.15,21.37 N:0'} G[-150062]={'62:40.16,62.10 N:0'} G[-150014]={'14:52.86,59.23 N:0'} +G[-142112]={'2112:38.38,36.83 N:0'} +G[-142025]={'2025:77.10,0.25 N:0'} G[-142024]={'2024:32.67,29.15 N:0'} G[-142023]={'2023:42.92,21.20 N:0'} +G[-142022]={'2022:31.92,33.68 N:0'} G[-141970]={'1970:34.05,48.13 N:0'} G[-141961]={'1961:68.14,90.83 N:0'} G[-141701]={'1701:46.46,50.68 N:0'} @@ -3492,6 +3689,7 @@ G[-132112]={'2112:67.17,93.87 N:0'} G[-132025]={'2025:77.45,5.59 N:0'} G[-132024]={'2024:64.48,88.40 N:0'} G[-132023]={'2023:26.55,83.43 N:0'} +G[-132022]={'2022:39.71,88.67 N:0'} G[-131970]={'1970:34.59,48.16 N:0'} G[-131961]={'1961:68.04,88.95 N:0'} G[-131701]={'1701:45.20,52.09 N:0'} @@ -3537,6 +3735,7 @@ G[-122112]={'2112:34.96,28.11 N:0'} G[-122025]={'2025:59.83,82.06 N:0'} G[-122024]={'2024:73.81,53.87 N:0'} G[-122023]={'2023:46.50,6.86 N:0'} +G[-122022]={'2022:47.09,6.57 N:0'} G[-121970]={'1970:59.66,36.26 N:0'} G[-121961]={'1961:70.39,90.47 N:0'} G[-121701]={'1701:44.99,53.45 N:0'} @@ -3582,6 +3781,7 @@ G[-120062]={'62:38.98,42.62 N:0'} G[-120051]={'51:76.62,41.53 N:0'} G[-120014]={'14:23.70,49.61 N:0'} G[-112112]={'2112:37.77,56.71 N:0'} +G[-112085]={'2085:54.24,68.54 N:0'} G[-112025]={'2025:58.30,35.43 N:0'} G[-112024]={'2024:13.89,49.85 N:0'} G[-112023]={'2023:31.95,7.62 N:0'} @@ -3636,6 +3836,7 @@ G[-110062]={'62:62.75,9.34 N:0'} G[-110051]={'51:77.58,46.02 N:0'} G[-110014]={'14:62.52,68.97 N:0'} G[-102112]={'2112:99.35,20.68 N:0'} +G[-102085]={'2085:61.32,50.61 N:0'} G[-102025]={'2025:57.04,65.16 N:0'} G[-102024]={'2024:59.07,55.67 N:0'} G[-102023]={'2023:22.69,98.85 N:0'} @@ -8838,6 +9039,7 @@ G[69678]={'FA 504:64.12,73.91 N:19644'} -- Phase 1 location. Phase 2 is NPC 569 G[69741]={'FA 504:63.16,73.87 N:4968'} G[69742]={'FH 504:32.91,32.58 N:16802'} G[69782]={'433:54.60,71.76 N:64616','Upstairs'} +G[69791]={'2024:48.98,19.04'} G[69899]={''} G[70022]={'507:33.00,53.89','In cave'} G[70100]={'516:60.26,28.69 N:64616'} @@ -15637,6 +15839,7 @@ G[184938]={'1970:34.07,48.60'} G[184949]={'1970:47.95,33.99'} G[185179]={'2023:60.40,37.66'} G[185297]={'1970:37.14,78.31'} +G[185468]={'84:50.98,71.85'} G[185506]={'1970:37.33,35.41'} G[185512]={'2070:60.80,51.37'} G[185513]={'2070:60.90,51.34'} @@ -15644,6 +15847,7 @@ G[185514]={'2070:61.98,50.51'} G[185517]={'1536:71.15,71.47'} G[185525]={'1670:41.57,63.08'} G[185556]={'2112:46.53,46.24 2025:39.44,59.33'} +G[185561]={'2112:46.67,78.79 2025:39.46,64.03'} G[185563]={'2112:10.45,58.29 2025:34.23,61.07'} G[185576]={'1670:55.53,49.28'} G[185587]={'1970:60.54,51.13'} @@ -15702,6 +15906,8 @@ G[186300]={'2023:64.02,18.30'} G[186303]={'2023:25.04,56.89'} G[186304]={'2024:70.01,35.23'} G[186305]={'2024:70.02,35.34'} +G[186331]={'2022:42.45,66.13'} +G[186359]={'2024:18.44,36.12'} G[186386]={'2024:45.51,54.18'} G[186410]={'2022:74.43,42.13'} G[186428]={'2022:74.51,42.16'} @@ -15711,6 +15917,7 @@ G[186448]={'2024:12.41,49.34'} G[186480]={'2024:13.24,49.55'} G[186493]={'2022:27.26,62.80'} G[186499]={'2089:53.39,43.93'} +G[186502]={'2023:28.56,60.41'} G[186503]={'2023:28.77,58.31'} G[186547]={'2024:13.48,48.68'} G[186554]={'2024:13.08,48.82'} @@ -15733,6 +15940,7 @@ G[186779]={'2024:76.95,39.43'} G[186795]={'2022:55.10,31.02'} G[186862]={'2024:78.38,39.98'} G[186869]={'2022:47.88,82.42'} +G[186870]={'2025:54.49,55.66'} G[186883]={'2109:62.21,36.48 2107:41.76,75.80'} G[186931]={'2025:60.05,82.45'} G[186933]={'2022:29.16,58.83'} @@ -15740,8 +15948,11 @@ G[186940]={'2023:60.33,40.75'} G[186941]={'2023:59.16,37.62'} G[186942]={'2023:60.34,38.03'} G[186953]={'2085:61.47,50.25 2025:59.89,82.06'} +G[186955]={'2023:29.74,60.16'} +G[187025]={'2025:60.27,82.16'} G[187034]={'2024:78.22,33.34'} G[187045]={'2022:27.30,62.58'} +G[187077]={'2022:22.72,95.27'} G[187089]={'2022:59.02,76.77'} G[187098]={'2025:54.96,75.64'} G[187100]={'2025:57.46,78.92'} @@ -15768,16 +15979,22 @@ G[187300]={'2025:37.86,75.46'} G[187301]={'2024:63.21,58.60'} G[187308]={'2024:63.51,52.99'} G[187310]={'2025:35.25,72.66'} +G[187323]={'2022:53.65,37.96'} G[187344]={'2092:59.83,66.15'} G[187393]={'2022:67.52,59.33'} G[187406]={'2022:55.18,24.95'} G[187435]={'2090:43.39,69.23'} G[187436]={'1671:46.47,56.19'} G[187439]={'2022:80.12,42.86'} +G[187447]={'2022:27.72,56.66'} G[187463]={'2024:22.73,41.67'} +G[187478]={'2023:61.75,51.41'} +G[187480]={'2023:62.77,57.94'} G[187495]={'2022:24.43,55.50'} +G[187525]={'2023:33.21,51.79'} G[187534]={'2024:60.93,50.59'} G[187535]={'2024:60.98,50.56'} +G[187609]={'2022:37.41,71.74'} G[187616]={'2024:60.91,50.50'} G[187658]={'2025:57.46,58.73'} G[187669]={'2112:61.39,39.09 2025:41.58,58.30'} @@ -15802,16 +16019,21 @@ G[188106]={'2023:28.26,57.69'} G[188144]={'2024:63.44,57.99'} G[188150]={'2023:25.65,48.40'} G[188156]={'2023:72.46,50.72'} +G[188179]={'2022:24.86,60.40'} G[188181]={'2023:22.14,50.97'} G[188224]={'2023:40.93,61.63'} G[188225]={'2023:39.06,66.00'} G[188265]={'2022:47.92,82.13'} G[188274]={'2023:85.53,15.86'} G[188276]={'2025:36.80,72.85'} +G[188283]={'2022:53.69,37.95'} +G[188285]={'2022:53.69,37.95'} G[188297]={'2022:59.11,34.85'} +G[188301]={'2022:55.16,38.20'} G[188342]={'84:51.53,70.41'} G[188503]={'2022:66.58,56.11'} G[188601]={'2023:25.67,40.43'} +G[188715]={'2023:53.58,38.00'} G[188735]={'2022:66.06,58.13'} G[188809]={'2024:35.37,36.94'} G[188845]={'2024:65.63,60.76'} @@ -15829,6 +16051,7 @@ G[189166]={'2024:65.03,58.63'} G[189171]={'2024:65.03,58.61'} G[189174]={'2025:52.66,67.29'} G[189188]={'2025:54.29,65.06'} +G[189197]={'2112:74.27,63.03 2025:43.44,61.76'} G[189207]={'2022:25.58,54.33'} G[189208]={'2024:46.12,40.99'} G[189226]={'2022:47.11,82.57'} @@ -15898,16 +16121,23 @@ G[190666]={'2024:19.16,24.73'} G[190672]={'2024:18.98,23.29'} G[190679]={'2024:18.54,23.67'} G[190691]={'2024:7.58,44.29'} +G[190726]={'2024:17.11,27.19'} G[190740]={'2022:57.96,67.31'} G[190799]={'2024:18.75,24.43'} +G[190855]={'2025:62.24,18.32'} +G[190865]={'2025:64.47,15.16'} G[190866]={'2022:60.17,66.43'} G[190868]={'2022:60.19,66.40'} G[190884]={'2024:19.26,26.90'} G[190892]={'2024:19.05,23.98'} +G[190899]={'2022:26.65,62.44'} G[190902]={'2025:72.51,56.16'} G[190929]={'2025:57.54,78.86'} G[190950]={'2023:49.34,49.40'} G[190968]={'2023:83.23,19.17'} +G[190980]={'2022:65.98,63.28'} +G[190981]={'2022:66.99,63.73'} +G[190986]={'2022:29.08,58.58'} G[191011]={'2022:65.33,63.67'} G[191012]={'2022:61.78,73.71'} G[191025]={'2022:61.90,73.82'} @@ -15916,19 +16146,23 @@ G[191058]={'2023:85.41,17.96'} G[191123]={'2024:63.17,58.68'} G[191150]={'2022:81.32,31.35'} G[191154]={'2023:66.32,24.35'} +G[191159]={'2023:39.97,67.48'} G[191174]={'2022:61.82,73.61'} G[191176]={'2022:61.73,73.76'} +G[191193]={'2022:27.67,56.39'} G[191205]={'Near2024'} -- he wanders in his cart a lot G[191229]={'2023:24.45,40.45'} G[191233]={'2023:22.25,36.86'} G[191280]={'2022:53.43,58.37'} G[191283]={'2023:61.44,39.50'} G[191369]={'2112:54.37,41.07 2025:40.57,58.59'} +G[191395]={'2022:39.39,77.34'} G[191485]={'2023:60.38,40.70'} G[191494]={'Near2023'} G[191511]={'2023:47.48,70.63'} G[191541]={'2023:83.49,62.48'} G[191595]={'2023:63.00,33.67'} +G[191604]={'2023:79.82,79.60'} G[191608]={'2023:82.33,73.44'} G[191611]={'2022:64.17,32.89'} G[191665]={'2023:82.96,63.31'} @@ -15950,16 +16184,20 @@ G[192222]={'2024:46.67,39.74'} G[192298]={'2022:45.95,81.49'} G[192438]={'2022:76.41,34.45'} G[192455]={'2025:57.45,59.07'} +G[192496]={'2025:60.49,58.66'} G[192498]={'2022:57.93,68.25'} G[192522]={'2112:72.78,66.17 2025:43.23,62.21'} G[192539]={'2022:59.86,71.60'} G[192543]={'2025:60.29,82.03'} +G[192573]={'2025:60.20,58.67'} G[192574]={'2022:60.23,72.19'} G[192621]={'2023:61.23,40.05'} G[192629]={'2023:71.42,49.60'} G[192633]={'2023:49.05,41.07'} G[192674]={'2022:61.44,70.14'} +G[192696]={'2025:59.09,61.23'} G[192724]={'Near2023'} +G[192744]={'2022:36.70,71.44'} G[192750]={'2024:41.22,35.88'} G[192795]={'2022:42.48,66.79'} G[192825]={'2024:63.58,28.90'} @@ -15967,6 +16205,7 @@ G[192830]={'2024:63.61,28.82'} G[192834]={'2023:52.26,46.17'} G[192889]={'2118:44.73,57.66'} G[192926]={'2023:62.49,41.63'} +G[192930]={'2022:34.12,64.85'} G[192941]={'2023:51.07,47.67'} G[193006]={'2024:13.14,49.26'} G[193015]={'2112:58.16,35.16 2025:41.12,57.73'} @@ -15980,6 +16219,7 @@ G[193223]={'2024:17.26,41.92'} G[193273]={'2025:36.79,72.84'} G[193287]={'2022:57.66,66.89'} G[193337]={'2024:63.68,58.91'} +G[193350]={'2024:53.87,50.65'} G[193359]={'2022:75.17,54.97'} G[193362]={'2022:76.58,33.66'} G[193363]={'2022:76.26,34.41'} @@ -15989,15 +16229,19 @@ G[193377]={'2022:61.56,68.56'} G[193411]={'2022:73.25,52.07'} G[193450]={'84:22.97,56.13'} G[193456]={'2022:25.11,56.23'} +G[193481]={'2023:86.41,54.04'} G[193500]={'2022:45.91,81.45'} G[193538]={'2025:50.14,67.78'} G[193548]={'2023:46.03,59.92'} +G[193659]={'2112:36.76,50.50 2025:38.03,59.95'} G[193669]={'2023:59.90,66.95'} +G[193678]={'2024:13.78,30.80'} G[193722]={'2022:23.22,89.44'} G[193740]={'2022:39.02,83.24'} G[193819]={'2022:66.86,64.77'} G[193835]={'2023:71.84,81.30'} G[193837]={'2024:77.99,32.47'} +G[193846]={'2112:28.78,60.36 2025:36.87,61.37'} G[193877]={'2024:14.07,49.45'} G[193885]={'2022:65.08,63.04'} G[193954]={'2022:39.08,83.28'} @@ -16007,19 +16251,26 @@ G[194022]={'84:82.53,23.93'} G[194026]={'2112:35.38,58.77 2025:37.83,61.14'} G[194076]={'2022:57.85,66.81'} G[194136]={'2022:65.48,58.60'} +G[194169]={'2024:57.69,41.47'} G[194174]={'2022:62.19,70.57'} G[194240]={'2022:37.46,76.92'} G[194284]={'2023:57.64,50.39'} +G[194342]={'2022:67.28,74.58'} G[194352]={'2023:56.21,47.66'} G[194409]={'2023:57.20,47.59'} G[194438]={'2023:50.66,48.17'} +G[194453]={'2023:43.86,49.90'} +G[194458]={'2023:56.42,51.43'} G[194462]={'2022:47.11,82.95'} +G[194495]={'2024:74.03,53.96'} G[194525]={'2022:54.43,30.83'} G[194578]={'2112:25.22,66.14 2025:36.36,62.21'} +G[194584]={'2022:63.38,75.81'} G[194590]={'2024:63.18,58.38'} G[194613]={'2024:28.47,35.11'} G[194680]={'2024:49.08,23.11'} G[194717]={'2025:40.50,48.93'} +G[194732]={'2022:13.88,91.44'} G[194772]={'2022:62.64,33.16'} G[194800]={'2022:56.81,64.50'} G[194801]={'2022:58.67,67.78'} @@ -16028,34 +16279,49 @@ G[194812]={'2025:40.49,48.98'} G[194904]={'2023:84.54,25.31'} G[194927]={'2023:61.03,40.43'} G[195024]={'2023:61.42,62.77'} +G[195064]={'2025:44.84,51.72'} G[195239]={'2023:62.13,36.43'} G[195252]={'2023:52.48,60.91'} G[195302]={'2023:63.12,34.04'} G[195303]={'2022:71.18,40.53'} G[195316]={'2023:49.36,63.13'} +G[195338]={'2022:63.76,76.63'} +G[195444]={'2022:63.67,75.00'} G[195454]={'2023:64.01,41.01'} +G[195489]={'2023:34.21,54.06'} G[195524]={'2023:61.98,41.81'} G[195543]={'2023:63.40,41.39'} G[195547]={'2023:62.53,42.47'} +G[195628]={'2025:58.00,35.22'} +G[195639]={'2022:79.14,25.26'} +G[195733]={'2023:56.97,51.65'} G[195768]={'2112:26.08,40.06 2025:36.48,58.44'} +G[195770]={'2112:36.22,50.07 2025:37.95,59.89'} G[195817]={'2024:13.54,48.51'} G[195899]={'1:55.94,12.32'} G[195912]={'84:25.00,53.06'} +G[195935]={'2024:12.84,49.19'} G[196012]={'2024:13.55,48.52'} +G[196016]={'2024:14.01,49.44'} G[196066]={'2112:84.19,54.36 2025:44.88,60.51'} +G[196072]={'2022:34.62,46.29'} G[196160]={'2025:40.50,48.93'} G[196191]={'2112:43.33,42.49 2025:38.98,58.79'} G[196254]={'2024:67.22,44.41'} G[196265]={'2022:26.43,58.77'} G[196392]={'2025:50.52,67.43'} +G[196426]={'2025:57.45,36.89'} G[196475]={'2112:84.34,53.56 2025:44.90,60.39'} G[196499]={'2112:50.18,56.22 2025:39.96,60.78'} G[196501]={'2024:67.30,44.34'} +G[196518]={'2022:27.59,56.68'} G[196520]={'2024:67.32,44.37'} +G[196544]={'2024:12.93,48.67'} G[196545]={'2024:65.94,25.27'} G[196572]={'2022:79.33,42.75'} +G[196598]={'2112:38.28,36.81 2025:38.25,57.97'} G[196620]={'2024:13.50,48.53'} -G[196643]={'2025:34.05,84.84'} +G[196643]={'Near'} G[196707]={'2023:60.40,37.72'} G[196744]={'2022:80.08,39.88'} G[196746]={'2022:81.60,45.44'} @@ -16068,6 +16334,7 @@ G[196838]={'2024:21.51,35.47'} G[196841]={'2024:12.47,49.23'} G[196984]={'2112:56.45,43.79 2025:40.87,58.98'} G[197011]={'2023:46.71,60.48'} +G[197095]={'2112:35.17,24.97 2025:37.80,56.26'} G[197279]={'1:55.81,12.66'} G[197478]={'Near'} G[197533]={'2112:50.14,62.36 2025:39.96,61.66'} @@ -16083,8 +16350,12 @@ G[198349]={'2112:25.49,40.92 2025:36.40,58.57'} G[198429]={'2118:45.29,61.33'} G[198507]={'2025:52.58,69.91'} G[198695]={'2025:60.67,53.82'} +G[198766]={'2023:80.88,78.43'} G[198846]={'2022:76.55,34.24'} +G[199120]={'2025:46.02,62.99'} G[199261]={'2112:31.22,65.07 2025:37.23,62.05'} -- also at 2112:54.37,60.16 2025:40.57,61.34 +G[199376]={'2112:41.87,40.50 2025:38.76,58.50'} +G[199407]={'2112:42.27,40.71 2025:38.82,58.53'} G[199425]={'2085:61.22,46.83 2025:59.84,81.33'} G[199526]={'2112:49.54,59.89 2025:39.87,61.30'} G[200747]={'2023:83.89,48.03'} @@ -18529,7 +18800,19 @@ G[701671]={'886:56.30,28.48 N:127151'} -- in Vindicaar above Antoran Wastes G[701672]={'831:68.26,56.88 N:127151'} -- in Vindicaar above Krokuun G[701673]={'831:51.70,51.53 A:120533'} -- in Vindicaar above Krokuun G[701674]={'883:45.51,24.58 831:38.83,25.62 A:121230'} -- in Vindicaar above Mac'Areee and Krokuun +G[701675]={'2112:49.34,55.70 2025:39.84,60.70 A:196643'} +G[701676]={'2025:58.77,58.43 A:32642'} +G[701677]={'2023:54.24,54.13 A:192941'} +G[701678]={'2112:48.78,55.28 2025:39.76,60.64 A:197631'} +G[701679]={'2022:79.04,25.23 A:196643'} +G[701680]={'2112:39.23,69.79 2025:38.38,62.74 A:192574'} +G[701681]={'2022:55.95,56.59 A:196643'} G[701682]={'630:49.24,46.35 A:110916'} +G[701683]={'2022:54.91,36.44 A:187323'} +G[701684]={'2022:54.91,36.44 A:188283'} +G[701685]={'2022:53.88,41.24 A:187323'} +G[701686]={'2024:7.65,44.28 A:196643'} +G[701687]={'84:50.67,73.82 A:42288'} G[701691]={'641:54.66,9.38 A:115664'} G[701692]={'641:53.67,9.17 A:115676'} G[701697]={'832:0.00,0.00 A:126408'} @@ -20371,9 +20654,15 @@ G[1380859]={'2023:51.99,58.39'} G[1380902]={'2023:62.33,42.31'} G[1381296]={'2025:38.92,45.24'} G[1381297]={'2025:41.46,47.36'} +G[1381584]={'2022:47.79,83.25'} +G[1381668]={'2022:48.94,82.74'} +G[1381669]={'2022:47.05,83.40'} +G[1381670]={'2022:47.78,82.22'} +G[1381672]={'2022:47.94,82.15'} G[1381687]={'2112:47.79,46.56 2025:39.62,59.38'} G[1381701]={'2023:39.56,56.42'} G[1382166]={'2112:36.27,65.08 2025:37.96,62.05'} +G[1384405]={'2022:53.12,35.36'} G[3234618]={'542:42.42,26.67 N:1234618'} G[3243912]={'587:47.08,37.93 A:1243912 N:500022'} G[5102700]={'735:60.43,34.52 A:102700 N:102700'} diff --git a/Grail-Quests-deDE/Grail-Quests-_retail_-deDE.lua b/Grail-Quests-deDE/Grail-Quests-_retail_-deDE.lua index 308f111..68dafae 100644 --- a/Grail-Quests-deDE/Grail-Quests-_retail_-deDE.lua +++ b/Grail-Quests-deDE/Grail-Quests-_retail_-deDE.lua @@ -36633,4 +36633,52 @@ G[120237102]='Lager der Aylaag' G[120237103]='Lager der Aylaag' end +if release >= 47213 then +G[66012]='Die versiegelte Tür' +G[66013]='Untersucht die Tür' +G[66094]='Die Ruinen von Szar Skeleth' +G[66128]='Nächste Schritte' +G[66409]='Drückende Anliegen' +G[66410]='Schlechtester Eindruck' +G[66411]='Aufgewühltes Wasser' +G[66413]='Übergreifende Hitze' +G[66414]='Alle bis auf einen' +G[66415]='Mitten durch' +G[66417]='Vorratssicherung' +G[66418]='Tuskarrsenal im Test' +G[66431]='In Trauer' +G[66440]='Abschluss' +G[66443]='Ruf an den Jagdtrupp' +G[66444]='Solange das Eisen heiß ist' +G[66673]='Sprecht mit Koranos' +G[66814]='Tyrs Urteil' +G[66902]='Hinfort, Bienen!' +G[67009]='Flunkerunfug' +G[67010]='Am Überkochen' +G[67014]='Gorlocs vom Winde verweht' +G[68640]='Plötzliche Isolation' +G[68863]='Ein verlorener Stamm' +G[69928]='Liskanoth' +G[70021]='Die Sage von Tapionnuq' +G[70418]='Drachenreiterrennen - Wildreservat-Parcours' +G[70420]='Drachenreiterrennen - Moor-Durchflug' +G[70426]='Drachenreiterrennen - Slalom des Azurblauen Gebirges' +G[70440]='Tote Augen' +G[70503]='Tyrs Wachsamkeit' +G[70507]='Tyrs Einsicht' +G[70612]='Essen zum Dreifällerundblick' +G[70766]='Die zerrüttete Flamme' +G[70784]='Der verlassene Außenposten' +G[70785]='Die Stadt der Toten' +G[71156]='Rebellensorgen' +G[72646]='Funken des Lebens: Küste des Erwachens' +G[72721]='Haustierchampion' +G[72724]='Ein wilder Weg durch die Zeit' +end + +if release >= 47631 then +G[41260]='Speckstreifen' +G[69942]='Brackenfellmysterien' +end + -- End of localized quest names diff --git a/Grail-Quests-enUS/Grail-Quests-_retail_-enUS.lua b/Grail-Quests-enUS/Grail-Quests-_retail_-enUS.lua index d6825f5..27cc2b3 100644 --- a/Grail-Quests-enUS/Grail-Quests-_retail_-enUS.lua +++ b/Grail-Quests-enUS/Grail-Quests-_retail_-enUS.lua @@ -39005,4 +39005,9 @@ G[74466]='Huntmaster Yrgena' G[74467]='Bloodbeak the Ravenous' end +if release >= 47936 then +G[66959]='Tour the Trading Post' +G[72681]='Report to the Trading Post' +end + -- End of localized quest names diff --git a/Grail-Quests/Grail-Quests-_retail_.lua b/Grail-Quests/Grail-Quests-_retail_.lua index b55f688..b0d8228 100644 --- a/Grail-Quests/Grail-Quests-_retail_.lua +++ b/Grail-Quests/Grail-Quests-_retail_.lua @@ -98,6 +98,7 @@ -- Qxxxx the equipped iLvl must be >= xxxx -- qxxxx the equipped iLvl must be < xxxx -- R spell effect has ever been present +-- rxxxy quest group xxx must have exactly y quests in log or turned in -- S skill possessed (where the value is Blizzard's spell ID of the skill) -- s skill not possessed (where the value is Blizzard's spell ID of the skill) -- Txxxyyyyy reputation xxx must be at least yyyyy value @@ -389,6 +390,7 @@ Grail.dailyMaximums = { [149] = 3, -- Horde Warfront [150] = 3, -- Maw [151] = 2, -- Venthyr Pridefall Hamlet + [152] = 1, -- Dragon Isles Waygate quests } Grail.weeklyMaximums = { @@ -2963,7 +2965,7 @@ G[8863]='L7864576 E31961' G[8864]='L7864576 E31961' G[8865]='L7864576 E31961' G[8866]='SP HL K16 L7864576 A:15871 T:15871' -G[8867]='HL K16 L7864576 A:15895 T:15895 O:8870,8871,8872,8873,8874,8875' +G[8867]='HL K16 L7864576 A:15895 T:15895 O:8870,8871,8872,8873,8874,8875,73169,73170' G[8868]='HL K16 L7864576 A:15864 T:15864' G[8870]='HL FA K16 L7864576 A:15892 T:15895 I:8871,8872' G[8871]='HL FA K16 L7864576 A:515892 T:15895 I:8870,8872' @@ -18581,7 +18583,7 @@ G[36774]='L40 T:76872 E18612' G[36775]='L40 T:-581 E18612' G[36776]='L40 T:-581 E18612' G[36777]='L40 T:-587 E18612' -G[36778]='L40 E18612' +G[36778]='L40 T:-590 E18612' G[36779]='L40 T:-590 E18612' G[36780]='L40 T:-581 E18612' G[36781]='L0 T:84852 E18612' @@ -37000,7 +37002,7 @@ G[64763]='K512 L60 A:180610 T:701524 P:64762 E42979' G[64764]='T:198846' G[64766]='K512 L60 A:180610 T:701524 P:64762 E42979' G[64767]='K512 L60 A:701524 T:701525 P:64763+64766 E42979' -G[64768]='L0 E47213' +G[64768]='K262144 L70 A:-2022 T:-2022 P:a64768 E47213' G[64771]='L60 A:181003 T:181003 P:64958' G[64772]='L60 A:181091 T:180984 P:%1902 E43114' G[64773]='L60 A:181098 T:181098 P:%1902 E43114' @@ -37557,7 +37559,7 @@ G[65837]='L60 A:195524 T:190024 E46479' -- immediately available when arriving a G[65838]='K4096 L65 A:187873 P:66026 E46479' G[65840]='L0 E46479' G[65841]='K32768 L65 A:-2024 T:-2024 P:a65841 E46479' -G[65842]='L0 E46781' +G[65842]='K4 L70 A:190899 T:190899 E46781' G[65844]='K4096 L65 A:186181 T:186181 P:65838 E46479' G[65845]='K4096 L65 A:701577 T:701577 P:65838 E46479' G[65846]='K4096 L65 A:701577 T:701577 P:65838 E46479' @@ -37645,13 +37647,15 @@ G[65998]='K4096 L60 A:187406 T:190171 P:65997 E46479' G[65999]='K4096 L60 A:187406 T:190171 P:65997 E46479' G[66000]='K4096 L60 A:1377499 T:190171 P:65997 ODC:69336 E46479' G[66001]='K4096 L61 A:190171 T:186795 P:65998+65999+66000 E46479' -G[66003]='L0 E46479' +G[66003]='L70 A:187609 T:187609 E46479' G[66004]='K2 A:-2170864 T:-864 P:a66004' G[66005]='L60 A:100191127 T:186649,701591 E46479' -- T:186649 is before anything else is being done G[66006]='L60 A:701591 T:186650 P:65952 E46479' G[66007]='K4096 L65 A:186779 T:186862 P:65958+65977 E46479' G[66009]='K4096 L66 A:186862 T:193837 P:66007 E46479' G[66011]='L61 A:701615 T:187270 P:65904 E46479' +G[66012]='K4096 L70 A:186869 T:192744 P:69093' +G[66013]='K4096 L70 A:186870 T:192744 P:66012' G[66015]='K4096 L66 A:187034 T:186188 P:70041 E46479' G[66016]='K4096 L63 A:191283 T:186941 P:65806 ODC:73701 E46479' G[66017]='K4096 L63 A:191283 T:191595 P:65806 E46479' @@ -37684,7 +37688,7 @@ G[66049]='K4096 L62 A:196265 T:187045 P:66044 E46479' G[66055]='K4096 L62 A:186493 T:186493 P:66049 E46479' G[66056]='K4096 L62 A:186493 T:701560 P:66055+65939 E46479' G[66057]='K4096 L62 A:701560 T:187495 P:66354 E46479' -G[66070]='L0 E47187' +G[66070]='K262144 L70 A:-2022 T:187077 P:a66070 E47187' G[66071]='L64 A:183912 T:183912 O:71239 E46479' G[66074]='K32768 L60 A:-2022 E46479' G[66076]='K32768 L60 A:-2022 E46479' @@ -37699,9 +37703,10 @@ G[66085]='K4096 L66 A:701582 T:701582 P:66083 E46479' G[66087]='K4096 L66 A:190929 T:190929 P:66084+66085 E46479' G[66090]='SP L0 A:185851 T:185851 P:65668 E46479' G[66091]='L0 E46479' +G[66094]='K4096 L70 A:186870 T:191159 P:66673' G[66100]='L64 A:191753 T:187289 O:71219,66448 E46479' G[66101]='L60 A:187257 T:187257 P:70122,65452' -G[66103]='L0 E46479' +G[66103]='K4 L70 A:190899 T:186331 E46479' G[66104]='L60 A:186410 T:186410 P:66105+66107' G[66105]='L60 A:186410 T:186410 O:72122' -- available immediately upon arrival on Dragon Isles G[66106]='L60 A:186428 T:186428 P:66104' @@ -37722,9 +37727,10 @@ G[66122]='K4096 L61 A:187119 T:191895,187129 P:66118 ODC:69223 E46479' -- TODO: G[66123]='K4096 L61 A:191895 T:191895 P:66121+66122 E46479' G[66124]='K4096 L61 A:191895 T:187278 P:66123 E46479' G[66126]='L0 E46479' +G[66128]='K4096 L70 A:193350 T:192744' G[66129]='L0 E46479' G[66130]='L0 E46479' -G[66131]='L0 E46479' +G[66131]='L0 T:187447 E46479' G[66133]='L0 E46479' G[66134]='L64 A:187300 T:187300 O:72189 E46479' G[66135]='L67 A:187300 T:187300 P:66134 E46479' @@ -37752,9 +37758,9 @@ G[66170]='L60 A:187436 T:187436 E46479' -- no idea what P: may be -- also comple G[66175]='L65 A:187198 T:187198 P:66147+66154+66164 E46479' G[66176]='L0 E46781' G[66177]='L65 A:187198 T:188030 P:66175 E46479' -G[66178]='L0 E47213' -G[66179]='L0 E47213' -G[66180]='L0 E47213' +G[66178]='K4096 L70 A:186955 T:187525 E47213' +G[66179]='K4096 L70 A:187525 E47213' +G[66180]='K4096 L70 A:187525 T:187525 E47213' G[66181]='L0 E47213' G[66182]='L0 E47213' G[66183]='L0 E47213' @@ -37771,7 +37777,7 @@ G[66201]='K4096 L63 A:701630 T:187787 P:66025 E46479' G[66203]='L0 E46781' G[66206]='L0 E46781' G[66210]='K4096 L65 A:186480 T:186480 P:65849 ODC:69609 E46479' -G[66211]='L65 A:186480 P:65849 E46479' +G[66211]='L65 A:186480 T:186480 P:65849 E46479' G[66212]='L65 A:193877 P:65849 E46479' G[66213]='L65 A:186446 P:65849 E46479' G[66217]='K512 L65 A:186568 P:65849 E46479' @@ -37821,9 +37827,9 @@ G[66277]='L0 E46479' G[66278]='L67 A:1376451 T:187300 P:C66135 E46479' G[66279]='L67 A:187300 T:187310 P:66278+66135 E46479' G[66299]='L68 A:701623 T:701624 P:65778 E46479' -G[66308]='L0 E46479' +G[66308]='K4 L70 A:188179 T:188179 E46479' G[66320]='K4096 L66 A:187669 T:187100 P:66252 E46479' -G[66321]='L0 E46479' +G[66321]='K4 L70 A:191193 T:191193 E46479' G[66323]='FH L60 A:187758 T:187758 E46479' G[66324]='K4096 L59 RY A:184163 T:184163 P:65307' G[66326]='L0 E46479' @@ -37835,7 +37841,7 @@ G[66333]='K4096 L64 A:189599 T:191494 P:66331 E46479' G[66335]='K4096 L64 A:191494 T:191494 P:66333 E46479' G[66336]='K4096 L64 A:188150 T:188181 P:66337 E46479' G[66337]='K4096 L64 A:191494 T:188150 P:66335+66784 E46479' -G[66339]='K512 L64 P:66783 E46479' +G[66339]='K512 L64 T:181198 P:66783 E46479' G[66340]='K4096 L64 A:188181 T:185599 P:66783 E46479' G[66344]='K4096 L64 A:188156 T:188106 P:66328 E46479' G[66349]='L0 E46479' @@ -37846,8 +37852,8 @@ G[66354]='K4096 L62 A:701560 T:701560 P:66056 E46479' G[66356]='A:-2170864 T:-864 P:a66356' G[66363]='L0 E46479' G[66364]='L0 E46479' -G[66368]='L0 E46479' -G[66369]='L0 E46479' +G[66368]='K4 L70 A:187609 T:187609 E46479' +G[66369]='L70 A:187609 T:187609 E46479' G[66383]='L60 A:181183 T:182257 E42979' G[66390]='FA L60 A:188342 T:188342' G[66391]='L65 A:188144 T:189171 E46479' -- TODO: This does not show up as available for a fresh L60 arriving without any renown @@ -37862,8 +37868,16 @@ G[66399]='L0 E47213' G[66400]='L0 E47213' G[66401]='L0 E47213' G[66402]='L0 E47213' +G[66409]='K4096 L70 A:188301 T:188301' +G[66410]='K4096 L70 A:188301 T:187323' +G[66411]='K4096 L70 A:188283 T:188283' G[66412]='L68 A:187300 T:187300 P:66139 E46479' -G[66419]='L0 E46479' +G[66413]='L70 A:1384405' +G[66414]='K4096 L70 A:187323' +G[66415]='K4096 L70' +G[66417]='K4096 L70 A:188285 T:188285' +G[66418]='K4096 L70 A:188285 T:188285' +G[66419]='K516 L70 A:-532022 T:-2022 P:a66419 E46479' G[66420]='FA L60 A:188342 T:188342 P:66390' G[66421]='K32768 L64 A:188601 T:191233 P:66331 E46479' -- A: is used just for accurate position without creating an alias for self G[66422]='L65 A:189166 T:189236 P:66352+66353 E46479' @@ -37873,13 +37887,17 @@ G[66426]='L65 A:189236 T:189792 P:66425 E46479' G[66427]='L65 A:189792 T:189792 P:66426 E46479' G[66428]='L65 A:189791 T:189791 P:66427 E46479' G[66429]='L65 A:189791 T:193337 P:66428 E46479' +G[66431]='K4096 L70 A:188283' G[66435]='L60 A:188735 T:190352 O:69896 E46479' -- available immediately on arrival on Dragon Isles G[66436]='L60 A:188735 T:190352 O:69896 E46479' -- available immediately on arrival on Dragon Isles G[66437]='L60 A:100191904 T:190352 P:C66436 E46479' G[66438]='L62 A:188503 T:190352 P:66435+66436+66437 E46479' G[66439]='L62 A:188053 T:190352 P:66435+66436+66437 E46479' +G[66440]='K4096 L70 T:187323' G[66441]='L60 A:190352 T:190352 P:66435+66436+66437 E46479' G[66442]='L62 A:190352 T:197860 P:66438+66439+66441 E46479' +G[66443]='T:188301' +G[66444]='K4096 L70 A:187323 T:187323' G[66445]='L0 E46479' G[66447]='L62 A:197860 T:190354 P:66442 E46479' G[66448]='L64 A:187202 T:191753 I:71219 ODC:71219 E46479' @@ -37926,7 +37944,7 @@ G[66529]='L60 A:193954 T:189484 P:66528 E46479' G[66534]='FH K4096 L60 RY A:189389 T:184786 P:66237 ODC:66513 E46479' G[66549]='L0 E46479' G[66550]='L0 E46479' -G[66551]='L0 E46479' +G[66551]='K278528 L0 A:-702022 T:-2022 P:a66551 E46479' G[66553]='L63 A:189401 T:189401 E46479' G[66554]='L63 A:189401 T:189401 E46479' G[66555]='L63 A:189401 T:189401 P:66553+66554 E46479' @@ -37940,7 +37958,7 @@ G[66578]='L0 E46479' G[66579]='L0 E46479' G[66582]='L68 A:189764 T:189764 P:70215 E46479' G[66586]='FH L60 A:701569 P:65439 E46702' -G[66588]='L0 E46479' +G[66588]='K278528 L0 A:-552022 T:-2022 P:a66588 E46479' G[66589]='FA K4096 L60 A:189602 T:189077 P:65101,66577 ODC:65443' -- Dracthyr do 65101, Nimhfree did 66577 G[66595]='L68 A:-2022 T:189066 P:_9CB7 E46479' G[66596]='FA K4096 L60 A:193450 T:701557 P:66589+72240 ODC:65439' @@ -37954,9 +37972,9 @@ G[66616]='K262144 L0 A:-571565 T:-1565 P:a66616 E46702' G[66617]='K262144 A:-601536 T:-1536 P:a66617' G[66618]='K262144 L0 A:-151543 T:-1543 P:a66618 E46479' G[66619]='K262144 A:-201970 T:-1970 P:a66619' -G[66620]='L0 E47213' +G[66620]='K4096 L70 A:197478 T:186955 E47213' G[66622]='L63 A:186755 T:186755 E46479' -G[66633]='L0 E46479' +G[66633]='K4 L70 A:190899 T:190899 E46479' G[66635]='L0 E47213' G[66646]='K4096 L66 A:186433 T:186433 P:65935 E46479' G[66647]='K4096 L65 A:186305 T:186688 P:65887 E46479' @@ -37973,6 +37991,7 @@ G[66658]='K512 L60 A:193985 T:190068 P:66657 E46479' G[66660]='K4096 L67 A:186931 T:187435 P:66037 E46479' G[66661]='L0 E46479' G[66671]='L64 A:190001 P:67036 E46479' +G[66673]='K4096 L70 A:186870 T:186870 P:66013' G[66675]='L70 A:187658 T:192455 P:70437 E46479' G[66676]='L60 A:701594 T:701641 P:65711 E46479' G[66679]='L0 E46479' @@ -37985,7 +38004,7 @@ G[66688]='L60 A:190164 T:1377226 E46479' -- immediately available when arriving G[66689]='L60 A:100194031 T:190025 P:C66680 E46479' G[66690]='K512 L61 A:190164 T:190164 P:66834+70374 E46479' G[66691]='L0 E46479' -G[66692]='L0 E46479' +G[66692]='K2 L70 A:-2022 E46479' G[66693]='K262144 L0 A:-741525 T:-1525 P:a66693 E46479' G[66694]='K262144 L0 A:-231543 T:-1543 P:a66694 E46479' G[66695]='K262144 A:-511970 T:-1970 P:a66695' @@ -38000,60 +38019,61 @@ G[66708]='L63 A:190300 T:189963 E46479' G[66709]='L63 A:189963 T:189963 P:66708 E46479' G[66710]='L0 E46479' G[66711]='K2 L62 A:701627 T:701627 P:~9C74+`20237102 E46479 W008' -G[66712]='L0 E46479' +G[66712]='K2 L70 A:-2022 E46479' G[66713]='L0 E46479' G[66714]='L0 E46479' G[66715]='L63 A:189963 T:189625 P:66709 E46479' G[66718]='K32768 L66 A:-2024 T:-2024 P:a66718 E46479' G[66719]='L61 E46479' -G[66721]='L0 E46479' -G[66722]='L0 E46479' +G[66721]='K2 L70 A:-2022 E46479' +G[66722]='K2 L70 A:-2022 E46479' G[66724]='L65 A:186386 T:701585 P:65926 E46479' -G[66725]='L0 E46479' -G[66726]='L0 E46479' -G[66727]='L0 E46479' -G[66728]='L0 E46479' +G[66725]='K2 L70 A:-2022 E46479' +G[66726]='K2 L70 A:-2022 E46479' +G[66727]='K2 L70 A:-2022 E46479' +G[66728]='K2 L70 A:-2022 E46479' G[66729]='L0 E46479' G[66730]='L66 A:701621 T:196812 P:67050 E46479' G[66732]='SP K2 L62 A:-2022 T:-2022 E46479' -G[66733]='L0 E46479' +G[66733]='K2 L70 A:-2022 E46479' G[66734]='L0 A:190525 T:190525 P:66997 E46479' G[66735]='L0 A:190525 T:190525 P:66997 E46479' G[66737]='L0 A:190533 T:190533 P:66734+66735 E46479' -- TODO: Verify requires 66734 -- TODO: Verify required for "Ruby Lifecalling" G[66777]='L0 E46479' -G[66778]='L0 E46479' +G[66778]='K2 L70 A:-2022 E46479' G[66779]='K4096 L62 A:185894 T:185894 P:66057 E46479' G[66780]='K4096 L62 A:187495 T:187495 P:66057 E46479' G[66781]='L63 A:190691 T:190691 E46479' G[66783]='K4096 L64 A:188181 T:188181 P:66336 ODC:66887,66888,66889 E46479' G[66784]='K4096 L64 A:191494 T:191494 P:66333 E46479' G[66785]='K4096 L62 A:190740 T:185904 P:65793 E46479' -G[66786]='L0 E46479' -G[66787]='L0 E46479' +G[66786]='K2 L70 A:-2022 E46479' +G[66787]='K2 L70 A:-2022 E46479' G[66788]='K4096 L62 A:185904 T:185904 P:66785 E46479' -G[66805]='L0 E46479' +G[66805]='K33284 L70 A:-2022 T:-2022 P:a66805 E46479' +G[66814]='K4096 L70 A:190855 T:192744' G[66825]='L61 A:191025 T:191025 P:66114 E46479' G[66827]='L62 A:190866 T:190866 P:70351 E46479' G[66828]='L62 A:190868 T:191011 P:66827 E46479' G[66830]='L62 A:191011 T:191011 P:66828 E46479' G[66831]='L62 A:191011 T:190868 P:66830 E46479' -- TODO: Verify required for "Ruby Lifecalling" -G[66833]='L0 E46479' +G[66833]='K262144 L70 A:-692022 T:-2022 P:a66833 E46479' G[66834]='L61 A:190164 T:190164 P:66687 E46479' G[66835]='L0 E46479' -G[66836]='L0 E46479' +G[66836]='K2 L70 A:-2023 E46479' G[66837]='L63 A:190315 T:190315 E46479' G[66838]='L63 A:190315 T:190315 E46479' G[66839]='L63 A:190672 T:190672 E46479' -G[66840]='L64 A:190679 T:190679 P:66838+66837+66844+66839 E46479' -- TODO: Verify requires 66837 66844 -G[66841]='L64 A:190666 T:190652 P:66838+66837+66844+66839 E46479' -- TODO: Verify requires 66837 66844 +G[66840]='L64 A:190679 T:190679 P:66838+66837+66839 E46479' +G[66841]='L64 A:190666 T:190652 P:66838+66837+66839 E46479' G[66843]='L60 A:190884 T:190884 E46479' G[66844]='L63 A:190892 T:190892 E46479' G[66845]='L64 A:190799 T:190799 P:66840+66841 E46479' -G[66846]='L64 A:191741 T:191741 P:66845 ODC:66985,66992,66995 E46479' -G[66847]='L70 A:190902 P:67073 E46479' +G[66846]='L64 A:191741 T:191741 P:66845 ODC:66985,66992,66995 E46479' -- Nimhfree had ODC:66993 instead of 66992...the rest were there +G[66847]='L70 A:190902 T:193460 P:67073 E46479' G[66848]='K4096 L63 A:184595 T:184595 P:65805 E46479' G[66856]='L0 E46479' -G[66858]='FA L0 E47799' +G[66858]='FA L0 T:185468 ODC:66959,72681 E47799' -- Alkahin got just by logging in at Valdrakken (zone 2112 -- what a Rush!). this causes others to have it automatically. G[66860]='K64 L70 A:191958 T:191958 E46479 W010' -- TODO: Determine whether the Relic Recovery: and Preserving the Past: quests are given out for the same dungeon each time (i.e., are they linked) G[66861]='K68 L70 A:191958 T:191958 E46479 W010' G[66862]='K68 L70 A:191958 T:191958 E46479 W010' @@ -38069,16 +38089,16 @@ G[66872]='K68 L70 A:189973 T:189973 E46479 W011' G[66873]='K68 L70 A:189973 T:189973 E46479 W011' G[66874]='K68 L70 A:189973 T:189973 E46479 W011' G[66875]='K68 L70 A:189973 T:189973 E46479 W011' -G[66877]='L0 E46479' -G[66878]='L0 E46479' +G[66877]='K2 L70 A:-2023 E46479' +G[66878]='K2 L70 A:-2023 E46479' G[66879]='L62 A:191176 T:191280 P:66825 E46479' G[66880]='L0 E46479' -G[66881]='L0 E46479' -G[66882]='L0 E46479' +G[66881]='K2 L70 A:-2023 E46479' +G[66882]='K2 L70 A:-2022 T:190899 E46479' G[66883]='L0 E46479' G[66884]='L0 E46479' G[66885]='L0 E46479' -G[66886]='L0 E46479' +G[66886]='K2 L70 A:-2023 E46479' G[66887]='T:188181' G[66888]='T:188181' G[66889]='T:188181' @@ -38093,10 +38113,10 @@ G[66897]='L0 E47187' G[66898]='T:185660' G[66899]='L0 E46479' G[66900]='L0 E46479' -G[66901]='L0 E46479' -G[66902]='L0 E47799' -G[66903]='L0 E46479' -G[66921]='L0 E46479' +G[66901]='K32768 L70 A:-612022 T:-2022 P:a66901 E46479' +G[66902]='K262144 L70 A:-672022 T:-2022 P:a66902 E47799' +G[66903]='K32768 L70 A:-1978 T:-2022 P:a66903 E46479' +G[66921]='K2 L70 A:-2023 E46479' G[66925]='L0 E47799' G[66929]='L0 E46479' G[66931]='K4096 L61 A:187290 T:190293 P:68799+70061 OAC:69607 E46479' @@ -38113,7 +38133,7 @@ G[66942]='L0 E46479' G[66943]='L0 E46479' G[66944]='L0 E46479' G[66945]='L0 E46479' -G[66946]='L0 E46479' +G[66946]='K2 L70 A:-2024 E46479' G[66947]='L0 E46479' G[66948]='K4096 L63 A:194927 T:194927 P:66969 E46479' G[66949]='L0 E46479' @@ -38136,25 +38156,29 @@ G[66969]='K4096 L63 A:192724 T:191283 P:66019+66020+66021 E46479' G[66970]='K32768 L64 A:-2023 E46479' G[66971]='L63 A:701637 T:194590 E46479' G[66972]='L63 A:701638 T:194590 E46479' +G[66985]='T:191741' G[66987]='L0 E47799' -G[66989]='L0 E47213' +G[66989]='K262144 L70 A:-2022 T:-2022 P:a66989 E47213' +G[66992]='T:191741' +G[66995]='T:191741' G[66997]='L62 A:191174 T:190525 P:66825 ODC:69600 E46479' G[66998]='L60 A:188297 T:188297 E46479' -- available immediately upon arrival on Dragon Isles -G[67002]='L0 E46479' +G[67002]='K2 L70 A:-2024 E46479' G[67003]='L0 E46479' G[67004]='L0 E46479' -G[67005]='L0 E46479' +G[67005]='K262400 L0 A:-162022 T:-2022 P:a67005 E46479' G[67006]='L0 E46479' G[67007]='L70 A:1381687 T:189973 P:0 E46479' -G[67009]='L0 E46479' +G[67009]='K262144 L70 A:-452022 T:-2022 P:a67009 E46479' +G[67010]='K262144 L70 A:-282022 T:-2022 P:a67010' G[67011]='L0 E46619' -G[67012]='L0 E47187' -G[67014]='L0 E46479' -G[67015]='L0 E46479' -G[67024]='K262144 A:-102022 T:-2022 P:a67024' +G[67012]='K262144 L70 A:-272022 T:-2022 P:a67012 E47187' +G[67014]='K262144 L70 A:-522022 T:-2022 P:a67014 E46479' +G[67015]='K32768 L70 A:-2022 T:-2022 P:a67015 E46479' +G[67024]='K262144 L70 A:-102022 T:-2022 P:a67024' G[67026]='L0 E46479' -G[67027]='L0 E46479' -G[67031]='L0 E46479' +G[67027]='K32768 L70 A:-2022 T:-2022 P:a67027 E46479' +G[67031]='K2 L70 A:-2024 E46479' G[67032]='L0 E46479' G[67033]='K4096 L64 A:183543 T:183543 P:66228,70747 E46479' G[67034]='K2 L62 A:185867 T:185867 P:~9C74+`20237101 E46479 W007' @@ -38168,8 +38192,8 @@ G[67051]='L0 E46479' G[67053]='FA L60 A:184449 T:184452 P:70122' G[67062]='L0 E47187' G[67063]='K512 L70 A:189207 P:70932 E46479' -G[67064]='L0 E46479' -G[67065]='L0 E46479' +G[67064]='L70 A:186502 T:189479 E46479' +G[67065]='K512 L70 A:187025 T:189479 E46479' G[67066]='L0 E46479' G[67067]='L0 E46479' G[67068]='L0 E46479' @@ -38182,18 +38206,18 @@ G[67077]='L0 E47187' G[67078]='L0 E47187' G[67079]='L0 E47187' G[67080]='L0 E46479' -G[67081]='L0 E47187' -G[67084]='L0 E47187' +G[67081]='L0 T:192496 E47187' +G[67084]='K4096 L70 A:192496 T:192573 E47187' G[67093]='L66 A:192543 P:E65962 E46479' G[67094]='L64 A:192522 T:192522 E46479' -G[67095]='L0 E46479' +G[67095]='K2 L70 A:-2025 E46479' G[67096]='L0 E46479' -G[67099]='L0 E46479' +G[67099]='K4 L70 A:191193 T:191193 E46479' G[67100]='L61 A:192574 T:192574 P:67564 E46479' G[67111]='L63 A:196254 T:196254 P:66964 E46479' G[67113]='L0 E46479' G[67137]='L62 A:192539 T:192674 E46479' -G[67142]='L0 E46479' +G[67142]='K4 L70 A:196518 T:196518 E46479' G[67143]='L62 A:192574 T:192539 P:67100 E46479' G[67154]='L66 A:192543 P:E65962 E46479' G[67167]='L0 E46479' @@ -38207,11 +38231,11 @@ G[67221]='L0 E46479' G[67222]='K2 L62 A:185853 T:185853 P:~9C74+`20237101 E46479 W007' G[67295]='L65 A:192539 T:192539 E46479' -- wowhead reports that you need to complete 65686 for this to be available, but Nimhfree has 66340 is the log (not turned in) and this was available G[67296]='L0 E46479' -G[67297]='L0 E46479' +G[67297]='K2 L70 A:-2024 E46479' G[67298]='L65 A:192539 T:193548 P:67295 E46479' G[67299]='L65 A:189751 P:0 E46479' -- TODO: Determine P:. Found on 65886 G[67564]='L61 A:192498 T:192574 P:66114 E46479' -G[67565]='L0 E46479' +G[67565]='K2 L70 A:-2024 E46479' G[67566]='L0 E46479' G[67605]='K514 L62 A:701606 T:701606 P:~9C74+`20237103 E46479 W009' G[67606]='L64 A:192522 T:192522 P:67094 ODC:69935 E46479' @@ -38228,6 +38252,7 @@ G[68084]='L65 A:192621 T:192633 P:68083 E46479' G[68085]='L65 A:192633 T:192633 P:68084 E46479' G[68087]='L65 A:192633 T:701644 P:71022 E46479' G[68639]='L63 A:192825 T:192825 E46479' +G[68640]='K4096 L70 A:193006 T:188301' G[68641]='L63 A:192830 T:192830 E46479' G[68642]='L63 A:192830 T:192830 P:68641+68639 E46479' G[68643]='L63 A:192825 T:192825 P:68641+68639 E46479' @@ -38238,7 +38263,8 @@ G[68796]='K4096 L61 A:193287 T:193359 P:65133 E46479' G[68797]='K4096 L61 A:193359 T:193359 P:68796 E46479' G[68798]='K4096 L61 A:193359 T:193359 P:68797 E46479' G[68799]='K4096 L61 A:193359 T:187290 P:68798 E46479' -G[69093]='L0 E46479' +G[68863]='K4096 L70 T:193006' +G[69093]='K4096 L69 A:196643 T:186869 P:_9CB13 E46479' G[69094]='L65 A:701644 T:701644 P:68087 E46479' G[69095]='L65 A:701644 T:192621 P:69094 E46479' G[69096]='L65 A:192621 T:192621 P:69095 E46479' -- TODO: Can turn in 2023:61.82,38.73 (192621) but if you want T: moves back @@ -38288,7 +38314,7 @@ G[69877]='L0 E46479' G[69878]='L0 E46479' G[69879]='L0 E46479' G[69880]='L0 E46479' -G[69882]='K2 A:-2170864 T:-864 P:a69882' +G[69882]='K32770 L70 A:-2170864 T:-864 P:a69882' G[69883]='L0 E46479' G[69885]='L0 A:-132024 T:-2024 P:a69885 E46479' G[69886]='L0 E46479' @@ -38310,38 +38336,39 @@ G[69913]='L0 E46479' G[69914]='K4096 L60 A:193372 T:193363 P:69912' G[69915]='L60 A:193108 T:193108 E46479' -- immediately available when arriving at Dragon Isles G[69916]='L0 E46479' -G[69918]='L0 E46479' +G[69918]='K4 L70 A:190899 E46479' G[69919]='L60 A:193108,194026 T:193108 ODC:71479,71481,71482,71483 E46479' -- immediately available when arriving at Dragon Isles G[69923]='FH L60 A:701568 P:65439 E46702' G[69924]='L0 E47187' G[69925]='FH L0 E46702' G[69926]='L0 E46479' G[69927]='L0 E47213' -G[69929]='L0 E46479' -G[69930]='L0 E47187' +G[69928]='K262144 L70 A:-112085 T:-2085 P:a69928' +G[69929]='K262144 L70 A:-452023 T:-2023 P:a69929 E46479' +G[69930]='K262144 L70 A:-382022 T:-2022 P:a69930 E47187' G[69931]='L0 E47187' G[69932]='L64 A:193538 T:193538 O:72399 E46479' G[69933]='L64 A:193538 T:193538 E46479' G[69934]='L64 A:193538 T:193042 P:69932+69933 E46479' G[69935]='T:192522' G[69936]='L60 A:189858 T:189858 P:66654+66655 E46479' -G[69938]='K262144 L0 A:-112022 T:-2022 P:a69938 E46479' +G[69938]='K262144 L70 A:-112022 T:-2022 P:a69938 E46479' G[69939]='L0 E47187' G[69940]='L0 E47213' G[69941]='L0 E46479' -G[69942]='L0 E47799' +G[69942]='K262144 L70 A:-372024 T:-2024 P:a69942 E47799' G[69944]='FH K4096 L60 A:197279 T:195899 P:65439 ODC:70050 E46479' G[69946]='L65 A:192574 T:193110 P:67295 E46479' -G[69949]='L0 E46479' -G[69951]='A:-2170864 T:-864 P:a69951' -G[69952]='A:-2170864 T:-864 P:a69952' +G[69949]='K262400 L0 A:-222025 T:-2025 P:a69949 E46479' +G[69951]='K32768 L70 A:-2170864 T:-864 P:a69951' +G[69952]='K32768 L70 A:-2170864 T:-864 P:a69952' G[69953]='A:-2170864 T:-864 P:a69953' G[69954]='A:-2170864 T:-864 P:a69954' -G[69955]='A:-2170864 T:-864 P:a69955' -G[69956]='A:-2170864 T:-864 P:a69956' -G[69957]='L0 E46479' +G[69955]='K32768 L70 A:-2170864 T:-864 P:a69955' +G[69956]='K32768 L70 A:-2170864 T:-864 P:a69956' +G[69957]='K2 L70 A:-2025 E46479' G[69958]='L0 E46479' -G[69959]='A:-2170864 T:-864 P:a69959' +G[69959]='K32768 L70 A:-2170864 T:-864 P:a69959' G[69960]='A:-2170864 T:-864 P:a69960' G[69961]='A:-2170864 T:-864 P:a69961' G[69962]='K2 A:-2170864 T:-864 P:a69962' @@ -38351,31 +38378,32 @@ G[69965]='L60 A:192438 T:192438 P:67053,66110' G[69966]='L0 A:-2170864 T:-864 P:a69966 E46479' G[69967]='K32768 L65 A:-2025 E46479' G[69968]='K32768 L60 A:193669 T:-2023 ODC:71240,72815 E46479' -G[69969]='A:-2170864 T:-864 P:a69969' +G[69969]='K32768 L70 A:-2170864 T:-864 P:a69969' G[69970]='A:-2170864 T:-864 P:a69970' -G[69971]='A:-2170864 T:-864 P:a69971' +G[69971]='K32768 L70 A:-2170864 T:-864 P:a69971' G[69972]='A:-2170864 T:-864 P:a69972' -G[69973]='A:-2170864 T:-864 P:a69973' -G[69974]='A:-2170864 T:-864 P:a69974' +G[69973]='K32768 L70 A:-2170864 T:-864 P:a69973' +G[69974]='K32768 L70 A:-2170864 T:-864 P:a69974' G[69975]='A:-2170864 T:-864 P:a69975' G[69976]='L0 E46479' G[69979]='L65 A:193110 T:193110 P:69946 E46479' G[69980]='L0 E46479' G[69981]='L60 A:193108 T:193835 P:69915 E46479' -G[69983]='L0 E46479' -G[69984]='L0 E46479' -G[69987]='L0 E46479' -G[69988]='L0 E46479' -G[69990]='L0 E46479' -G[69991]='L0 E46479' +G[69983]='L0 T:190899 E46479' +G[69984]='K4 L70 A:-2022 T:191193 E46479' +G[69987]='K262144 L70 A:-252023 T:-2023 P:a69987 E46479' +G[69988]='K262144 L70 A:-192023 T:-2023 P:a69988 E46479' +G[69990]='K262144 L70 A:-2023 T:-2023 P:a69990 E46479' +G[69991]='K512 L70 A:-582023 T:-2023 P:a69991 E46479' G[69992]='FH L0 E46702' -G[69993]='L0 E46479' -G[69994]='L0 E46479' -G[69995]='L0 E46479' +G[69993]='K262144 L70 A:-2023 T:-2023 P:a69993 E46479' +G[69994]='K512 L70 A:-582023 T:-2023 P:a69994 E46479' +G[69995]='K262144 L70 A:-2023 T:188715 P:a69995 E46479' G[70011]='K262144 L0 A:-102024 T:-2024 P:a70011 E46479' G[70012]='L0 E47187' G[70015]='L0 E46479' -G[70016]='K262144 L0 A:-122024 T:-2024 P:a70016 E46479' +G[70016]='K262144 L70 A:-122024 T:-2024 P:a70016 E46479' +G[70021]='K262144 L70 A:-362022 T:-2022 P:a70021' G[70025]='L0 E46479' G[70026]='L0 E46479' G[70027]='L0 E46479' @@ -38392,32 +38420,39 @@ G[70041]='K4096 L66 A:193837 T:187034 P:66009 E46479' G[70042]='L0 E46479' G[70044]='FA L0 E46479' G[70045]='FH L0 E46479' -G[70047]='L0 E47187' +G[70047]='K262144 L70 A:-2024 T:194169 P:a70047 E47187' G[70048]='FA L60 A:193450 P:66596 E46702' G[70049]='FA L0 E46702' G[70050]='FA K4096 L60 A:189077 T:195912 P:66596 ODC:69944 E46479' -G[70051]='L0 E46479' -G[70052]='L0 E46479' +G[70051]='K2 L70 A:-2025 E46479' +G[70052]='K2 L70 A:-2025 E46479' G[70054]='FH L0 E46479' G[70055]='FA L0 E46702' -G[70057]='L0 E46479' +G[70057]='K262144 L70 A:-2025 T:-2025 P:a70057 E46479' G[70058]='L61 A:193955 T:192674 P:66114 E46479' -G[70059]='L0 E46479' +G[70059]='K2 L70 A:-2025 E46479' G[70060]='L0 E46479' G[70061]='K4096 L61 A:194174 T:191768 P:66115 E46479' -- TODO: When learning Dragon flying do not turn this in yet G[70062]='L60 A:186503 T:186503 E46479' -- immediately available when arriving at Dragon Isles -G[70064]='L0 E46479' -G[70066]='L0 E46479' -G[70067]='L0 E46479' -G[70068]='L0 E46479' +G[70064]='K262144 L70 A:-2024 T:-2024 P:a70064 E46479' +G[70066]='K262144 L70 A:-2025 T:192696 P:a70066 E46479' +G[70067]='K512 L70 A:-552023 T:-2023 P:a70067 E46479' +G[70068]='K512 L70 A:-382024 T:-2024 P:a70068 E46479' G[70069]='L60 A:186503 T:186503 P:70062 E46479' G[70070]='L60 A:186503 T:186503 P:70069 E46479' G[70072]='L0 E46479' G[70074]='L0 E46479' -G[70075]='L0 E46781' -G[70079]='L0 E46479' -G[70100]='L0 E46479' -G[70110]='L0 E46479' +G[70075]='K262144 L70 A:-342022 T:-2022 P:a70075 E46781' +G[70079]='K262144 L70 A:-2023 T:-2023 P:a70079 E46479' +G[70082]='T:184986' +G[70085]='T:184972' +G[70086]='T:187767' +G[70087]='T:189813' +G[70088]='T:190496' +G[70089]='T:184986' +G[70093]='T:184972' +G[70100]='K262144 L70 A:-332024 T:-2024 P:a70100 E46479' +G[70110]='K262144 L70 A:-332025 T:-2025 P:a70110 E46479' G[70112]='L0 E46479' G[70122]='FA K4096 L60 A:189022 T:187251 P:67700 ODC:65452' -- unlocks faction "Dragonscale Expedition" G[70123]='FA K4096 L60 A:189035 T:187252 P:67700 ODC:65453' @@ -38430,16 +38465,16 @@ G[70134]='L62 A:194076 T:194076 P:70132 E46479' G[70135]='FA L60 A:184452 T:184452 P:67053' G[70136]='K4096 L66 A:187098 T:187098 P:66080 E46479' G[70139]='L64 A:189045 T:189045 P:65913 E46479' -G[70146]='K262144 L0 A:-132023 T:-2023 P:a70146 E46479' +G[70146]='K512 L70 A:-132023 T:-2023 P:a70146 E46479' G[70148]='L60 RY A:192438' -- available immediately upon arriving on Dragon Isles -G[70149]='L0 E46479' +G[70149]='K262144 L70 A:-212023 T:193481 P:a70149 E46479' G[70150]='L0 E46479' G[70152]='L0 E46619' G[70154]='L68 A:189764 T:701599 P:66582 E46479' G[70155]='L0 RY E46479' G[70156]='L68 A:701599 T:189066 P:70154 E46479' -- completes "An Ancient Awakening" G[70157]='L0 E46479' -G[70158]='L0 E46479' +G[70158]='K2 L70 A:-2025 E46479' G[70159]='FH L60 RY A:194462 T:194462 E46479' G[70160]='L0 E47213' G[70161]='L0 E46479' @@ -38450,10 +38485,10 @@ G[70168]='L0 P:70166 E46479' --TODO: Yoshimo: verify 70166 G[70169]='L0 E46479' G[70170]='L0 E46479' G[70171]='L0 E46479' -G[70172]='L0 E47187' +G[70172]='K262144 L70 A:-2022 T:-2022 P:a70172 E47187' G[70174]='K4096 L62 A:701562,701566 T:181217 P:65783 E46479' G[70175]='L0 E46479' -G[70176]='L0 E46479' +G[70176]='K262144 L70 A:-2023 T:194453 P:a70176 E46479' G[70178]='L0 E46479' G[70179]='L60 A:194525 T:194525 P:65997 E46479' G[70180]='K4096 L67 A:196066 T:196475 P:72773 E46479' -- completes "Lock and Shock" @@ -38475,22 +38510,22 @@ G[70195]='K4096 L63 A:195316 T:190648 P:66224 E46479' G[70196]='K32768 L62 A:-2022 T:-2022 P:a70196 E46479' G[70197]='FA L0 T:189077 ODC:70198 E46479' G[70198]='FH L0 T:197279 ODC:70197 E46479' -G[70199]='L0 E46479' +G[70199]='L0 T:194584 E46479' G[70200]='L0 E46479' G[70201]='L0 E46479' G[70202]='L0 E46479' G[70203]='L0 E46479' G[70204]='L0 E46479' G[70207]='L0 E46479' -G[70209]='L0 E46479' +G[70209]='K262400 L0 A:-322023 T:-2023 P:a70209 E46479' G[70210]='K2 L62 A:701618 T:701618 P:~9C74+`20237103 E46479 W009' G[70211]='L0 E47799' G[70212]='L0 E46479' G[70213]='L0 E46479' G[70215]='L68 A:189764 T:189764 P:66598 E46479' G[70220]='K4096 L64 A:188106 T:188106 P:66344 E46479' -G[70221]='SP L0 P:69915 E46479' -- A: and T: same (192574) 2023:71.74,81.23 -G[70224]='L0 E46479' +G[70221]='SP L0 A:701663 T:701663 P:69915 E46479' -- A: and T: same (192574) 2023:71.74,81.23 +G[70224]='K262144 L70 A:-432025 T:-2025 P:a70224 E46479' G[70229]='K4096 L63 A:187787 T:186290 P:66222 E46479' G[70233]='L0 E46479' G[70234]='L0 E46479' @@ -38531,47 +38566,53 @@ G[70374]='L61 A:190950 T:190164 P:66688 E46479' G[70376]='L0 E46479' G[70377]='L0 T:198062 E46479' G[70379]='T:191608' +G[70381]='T:188274' G[70382]='L0 E47187' +G[70383]='T:192761' G[70390]='L0 E46479' G[70410]='L0 E46479' -G[70412]='L0 E46479' -G[70413]='L0 E47213' +G[70412]='K262144 L70 A:-2022 T:-2022 P:a70412 E46479' +G[70413]='K262144 L70 A:-642022 T:-2022 P:a70413 E47213' G[70414]='L0 E46479' -G[70415]='L0 E46479' +G[70415]='K262144 L70 A:-762022 T:-2022 P:a70415 E46479' G[70416]='L0 E47213' -G[70417]='L0 E46619' -G[70418]='L0 E47799' +G[70417]='K262144 L70 A:-292022 T:-2022 P:a70417 E46619' +G[70418]='K262144 L70 A:-2022 T:-2022 P:a70418 E47799' G[70419]='L0 E46479' -G[70420]='L0 E46479' -G[70421]='L0 E46479' -G[70422]='L0 E47187' -G[70423]='L0 E46781' +G[70420]='K262144 L70 A:-562023 T:-2023 P:a70420 E46479' +G[70421]='K262144 L70 A:-362023 T:-2023 P:a70421 E46479' +G[70422]='K262144 L70 A:-2023 T:-2023 P:a70422 E47187' +G[70423]='K262144 L70 A:-202023 T:-2023 P:a70423 E46781' G[70424]='L0 E46479' -G[70425]='L0 E46479' -G[70427]='L0 E47187' -G[70428]='L0 E46479' -G[70429]='L0 E47187' +G[70425]='K262144 L70 A:-2024 T:-2024 P:a70425 E46479' +G[70426]='K262144 L70 A:-452024 T:-2024 P:a70426' +G[70427]='K262144 L70 A:-172024 T:-2024 P:a70427 E47187' +G[70428]='K262144 L70 A:-252024 T:-2024 P:a70428 E46479' +G[70429]='K262144 L70 A:-2024 T:-2024 P:a70429 E47187' G[70430]='L0 E46479' -G[70431]='L0 E46479' -G[70432]='L0 E46619' -G[70433]='L0 E47187' -G[70434]='L0 E46479' -G[70435]='L0 E46781' +G[70431]='K262144 L70 A:-2025 T:-2025 P:a70431 E46479' +G[70432]='K262144 L70 A:-2025 T:-2025 P:a70432 E46619' +G[70433]='K262144 L70 A:-2025 T:-2025 P:a70433 E47187' +G[70434]='K262144 L70 A:-242025 T:-2025 P:a70434 E46479' +G[70435]='K262144 L70 A:-2025 T:-2025 P:a70435 E46781' G[70436]='L0 E46479' G[70437]='L70 A:187678 T:187658 E46479' -G[70438]='L0 E46479' -G[70439]='L0 E46479' +G[70438]='K2 L70 A:195338 T:195338 E46479' +G[70439]='K262400 L70 A:-2024 T:-2024 P:a70439 E46479' +G[70440]='K262144 L70 A:-2024 T:-2024 P:a70440' G[70442]='L0 E47187' G[70444]='K512 L60 A:1380902 T:188868 E46479' -- immediately available when arriving at Dragon Isles G[70446]='L0 RY E46479' -G[70450]='L0 E46479' +G[70450]='K2 L70 A:195444 T:195444 E46479' G[70501]='L70 A:195454 T:195454 E46479' -- TODO: Not known whether there is a P: because L69 that saw this available soon is renown 6 with maruuk centaur. L70 is correct though. -G[70502]='L0 E46781' +G[70502]='K262144 L70 A:-442022 T:-2022 P:a70502 E46781' +G[70503]='K4096 L70 A:193350 T:193350 P:70784' +G[70507]='K4096 L70 A:191159 T:191159' G[70509]='L0 E46479' G[70510]='L0 E46479' G[70515]='T:191229' G[70526]='L0 E46479' -G[70529]='L0 E46479' +G[70529]='K262144 L70 A:-182024 T:-2024 P:a70529 E46479' G[70530]='L0 E46619' G[70531]='L0 E46479' G[70532]='L0 E46479' @@ -38581,7 +38622,7 @@ G[70540]='L0 E46479' G[70541]='L60 A:192926 T:192926 P:_9C79 E46479' G[70542]='L0 E46479' G[70545]='L0 E47213' -G[70549]='K262144 L0 A:-112023 T:-2023 P:a70549 E46479' +G[70549]='K262144 L70 A:-112023 T:-2023 P:a70549 E46479' G[70550]='L68 A:194680 T:194680 O:72784 E46479' -- TODO: Verify the O:. G[70557]='L0 E46479' G[70558]='L0 E46479' @@ -38606,67 +38647,68 @@ G[70592]='L0 E46479' G[70593]='L0 E46479' G[70594]='L0 E46479' G[70595]='L0 E46479' -G[70602]='K262144 A:-112025 T:-2025 P:a70602' -G[70612]='L0 E47799' +G[70602]='K262144 L70 A:-112025 T:-2025 P:a70602' +G[70612]='K262144 L70 A:-312024 T:-2024 P:a70612 E47799' G[70613]='L0 E46479' G[70614]='L0 E46479' G[70615]='L0 E46781' G[70616]='L0 E46479' G[70617]='L0 E46479' G[70618]='L0 E46479' -G[70619]='L0 E46479' -G[70620]='L0 E46479' +G[70619]='K262144 L70 A:-222112 T:193846 P:a70619 E46479' +G[70620]='K262144 L70 A:-152112 T:193846 P:a70620 E46479' G[70621]='L0 E46479' G[70622]='L0 E46479' -G[70623]='L0 E46479' -G[70625]='L0 E46479' +G[70623]='K262144 L70 A:-2023 T:-2023 P:a70623 E46479' +G[70625]='K512 L70 A:-322024 T:69791 P:a70625 E46479' G[70627]='L66 A:191123 T:189401 P:66152+0 E46479' --TODO: Yoshimo: not available for my monk, text hints at a possible breadcrumb G[70629]='L0 E47213' G[70631]='L0 E46781' -G[70632]='L0 E46479' +G[70632]='K262144 L70 A:-502022 T:-2022 P:a70632 E46479' G[70633]='L0 E46479' G[70634]='L0 E47187' -G[70636]='L0 E46479' -G[70638]='L0 E46479' -G[70639]='L0 E46479' +G[70636]='K262144 L70 A:-652022 T:-2022 P:a70636 E46479' +G[70638]='K262144 L70 A:-222023 T:-2023 P:a70638 E46479' +G[70639]='K262144 L70 A:-262024 T:-2024 P:a70639 E46479' G[70640]='L0 E46479' G[70641]='L0 E46479' G[70643]='L0 E46479' G[70644]='L0 E46479' -G[70646]='L0 E46479' +G[70646]='K262144 L70 A:-142023 T:-2023 P:a70646 E46479' G[70647]='L67 A:185563 T:185563 P:0 E46479' -- Determine P:. Found when looking at map after doing main quests. G[70648]='K32768 L60 A:-2022 T:190080 ODC:72839 E46479' -G[70649]='K262144 L0 A:-142023 T:-2023 P:a70649 E46479' +G[70649]='K262144 L70 A:-142023 T:-2023 P:a70649 E46479' G[70650]='L0 E46479' -G[70651]='L0 E47187' -G[70652]='L0 E46619' -G[70653]='L0 E46479' -G[70654]='L0 E46781' +G[70651]='K262144 L70 A:-462022 T:-2022 P:a70651 E47187' +G[70652]='K262144 L70 A:-2023 T:-2023 P:a70652 E46619' +G[70653]='K262144 L70 A:-242024 T:-2024 P:a70653 E46479' +G[70654]='K262144 L70 A:-2025 T:-2025 P:a70654 E46781' G[70655]='L0 E46479' G[70658]='L0 E46479' -G[70659]='L0 E47187' +G[70659]='K262144 L70 A:-242023 T:-2023 P:a70659 E47187' G[70661]='L0 E46479' -G[70662]='L0 E47187' +G[70662]='K262144 L70 A:-162024 T:-2024 P:a70662 E47187' G[70697]='L67 A:185563 P:70647 E46479' G[70698]='L0 E46479' -G[70699]='L0 E46479' +G[70699]='K262144 L70 A:-2025 T:-2025 P:a70699 E46479' G[70701]='K2 L62 A:701606 T:701606 P:~9C74+`20237103 E46479 W009' -G[70702]='L69 A:196643 T:189066 E46479' +G[70702]='L69 A:196643 T:189066 P:_9CB8 ODC:71183 E46479' G[70703]='L0 E47187' G[70706]='L0 E46479' G[70708]='L0 P:(70242 E46479' +G[70709]='T:196072' G[70710]='K2 L62 A:-2023 E46479' G[70711]='L0 E46479' -G[70712]='L0 E46619' +G[70712]='K262144 L70 A:-422023 T:-2023 P:a70712 E46619' G[70713]='L0 E47799' G[70715]='L0 E47187' G[70716]='L0 E47187' G[70717]='L0 E47799' -G[70719]='L0 E46479' +G[70719]='K32770 L70 A:-2022 E46479' G[70720]='L0 E46479' G[70721]='L60 A:190192 T:197011 P:70739+70730 E46479' -- TODO: Verify requires 70739 G[70722]='L0 E46479' -G[70723]='L0 E46479' +G[70723]='L0 T:196598 E46479' G[70730]='L60 A:190192 T:190192 E46479' -- immediately available when arriving at Dragon Isles G[70732]='L0 E46479' G[70738]='L64 A:194717 T:194717 P:72246 E46479' @@ -38682,15 +38724,18 @@ G[70747]='L0 RY P:70746 E46479' G[70748]='L0 RY P:71182 E46479' G[70750]='K4100 L67 A:196499 P:71232 OAC:72369 E46479' G[70751]='L0 E46479' -G[70752]='L0 E46479' -G[70753]='L0 E46479' -G[70754]='L0 E46479' -G[70763]='L0 E46479' +G[70752]='K4 L70 A:-2085 T:196598 E46479' +G[70753]='K4 L70 A:-2025 T:196598 E46479' +G[70754]='K4 L70 A:-2025 T:196598 E46479' +G[70763]='K32770 L70 A:-2022 E46479' +G[70766]='T:191159' G[70779]='L0 E46479' G[70780]='L0 E46479' G[70781]='L64 A:196392 T:183912 E46479' G[70782]='L0 E46619' G[70783]='K32768 L61 A:-2023 E46479' +G[70784]='K4096 L70 A:186870 T:193350 P:66673' +G[70785]='K4096 L70 A:186870 T:192744 P:66673' G[70788]='L0 E46479' G[70789]='L0 E46479' G[70790]='L0 E46479' @@ -38699,20 +38744,20 @@ G[70805]='L0 E46479' G[70806]='L0 E46479' G[70807]='SP L0 A:188265 T:188265 P:_9CB7 ODC:72033 E46479' G[70808]='L0 E46479' -G[70809]='L0 E46479' +G[70809]='L0 T:188265 E46479' G[70810]='L0 E46479' G[70812]='SP L60 A:187700 T:187700 P:_9CB4 ODC:72025 E46479' G[70813]='SP L0 A:187700 T:187700 P:_9CB5 ODC:72026 E46479' -G[70814]='L0 E46479' +G[70814]='L0 T:188265 E46479' G[70815]='L0 E46479' G[70817]='L0 E46479' G[70818]='L0 E46479' -G[70819]='L0 E46479' +G[70819]='L0 T:187700 E46479' G[70820]='L0 E46479' G[70821]='L0 E46479' G[70822]='SP L0 A:187700 T:187700 P:_9CB2 ODC:72023 E46479' -- it looks like the ODC: happened if that quest was not already done. G[70828]='L0 E46479' -G[70831]='L0 E46479' +G[70831]='L0 T:188265 E46479' G[70832]='L0 E46479' G[70833]='L0 E46479' G[70834]='L0 E46479' @@ -38747,7 +38792,7 @@ G[70877]='L62 A:196744 T:186428 P:66196+c70872 ODC:70872 E46479' G[70878]='L0 P:70874 E46479' G[70879]='L0 P:70875+70876+70878 E46479' -- TODO: Yoshimo: verify 70876 G[70880]='SP L0 A:185556 T:185556 P:_9CE3 ODC:72669 E46479' -G[70881]='L0 E46479' +G[70881]='K4096 L70 A:196475 T:196475 E46479' G[70882]='SP L60 A:193015 T:193015 P:_9CE4 E46479' G[70883]='L60 A:193015 T:187300 P:_9CE6 ODC:72672,71046 E46479' G[70884]='L0 E47799' @@ -38758,12 +38803,12 @@ G[70889]='L0 E46479' G[70891]='L0 E46479' G[70892]='L0 E46479' G[70893]='K4 L67 A:196620 T:196620 E46479' -- TODO: This does not show up as available for a fresh L60 arriving without any renown -G[70895]='L0 E46479' -G[70896]='L0 E46479' -G[70897]='L0 E46479' +G[70895]='L0 T:185561 E46479' +G[70896]='L0 T:193659 E46479' +G[70897]='L0 T:195770 E46479' G[70899]='L0 E46479' G[70900]='L0 E46479' -G[70901]='L0 E46479' +G[70901]='L0 T:189197 E46479' G[70902]='L0 E46479' G[70903]='L0 E46479' G[70904]='L0 E46479' @@ -38802,8 +38847,8 @@ G[70940]='L0 E46479' G[70941]='L67 A:197631 T:186554 P:_9CF4 E46479' G[70942]='L0 E46479' G[70943]='L0 E46479' -G[70944]='L0 E46479' -G[70945]='L0 E46479' +G[70944]='L0 T:195935 E46479' +G[70945]='L0 T:195935 E46479' G[70946]='L66 A:191715 T:191715 P:70931+70937 E46479' G[70947]='L0 E46479' G[70948]='L0 E46479' @@ -38811,12 +38856,12 @@ G[70950]='L0 E46479' G[70952]='L0 E46479' G[70953]='L0 E46479' G[70954]='L0 E46479' -G[70955]='L0 E46479' +G[70955]='L0 T:196544 E46479' G[70956]='L0 E46479' -G[70957]='L0 E46479' -G[70958]='L0 E46479' +G[70957]='L70 A:189479 T:186502 E46479' +G[70958]='L70 A:189479 T:187025 E46479' G[70959]='L0 E46479' -G[70960]='L0 E46479' +G[70960]='L0 T:196016 E46479' G[70961]='L0 E46479' G[70962]='L0 E46479' G[70963]='L0 E46479' @@ -38829,7 +38874,7 @@ G[70969]='L0 E46479' G[70970]='L66 A:196520 T:196520 P:70946 E46479' G[70971]='L0 E46479' G[70972]='L0 E46479' -G[70975]='L0 E46479' +G[70975]='K4 L70 A:1381584 T:189226 E46479' G[70976]='L0 E46479' G[70977]='L0 E46479' G[70978]='L0 E46479' @@ -38837,7 +38882,7 @@ G[70979]='L0 A:6000002 T:-864 P:a70979 E46479' G[70981]='L0 E46479' G[70983]='A:-2170864 T:-864 P:a70983' G[70984]='L0 E46479' -G[70985]='L0 E46479' +G[70985]='L70 A:195489 T:195489 E46479' G[70986]='K32768 L66 A:-2025 P:0 E46479' G[70987]='L0 E46479' G[70988]='L0 E46479' @@ -38852,20 +38897,20 @@ G[71000]='L67 A:196806 T:196812 P:70996 E46479' G[71001]='L0 E46479' G[71002]='L0 E46479' G[71004]='L0 E46479' -G[71005]='L0 E46479' -G[71007]='L0 E46479' -G[71008]='L0 E46479' +G[71005]='K4 L70 A:1381668 T:189226 E46479' +G[71007]='K4 L70 A:1381669 T:189226 E46479' +G[71008]='K4 L70 A:1381670 T:189226 E46479' G[71009]='L66 A:196816 T:196838 P:71015 E46479' -G[71010]='L0 E46479' -G[71011]='L0 E46479' +G[71010]='L0 T:189226 E46479' +G[71011]='K4 L70 A:1381672 E46479' G[71012]='L66 A:196838 T:196812 P:71009 E46479' G[71013]='L66 A:196812 T:196812 P:66730 E46479' G[71014]='L66 A:196812 T:196806 P:71013 E46479' G[71015]='L66 A:196812 T:196816 P:71013 E46479' G[71016]='L66 A:196812 T:196841 P:71013 E46479' G[71017]='L67 A:196841 T:196812 P:71016 E46479' -G[71018]='L0 E46479' -G[71019]='L0 E47187' +G[71018]='L70 A:193460 E46479' +G[71019]='L70 E47187' G[71020]='L0 E47187' G[71022]='L65 A:192633 T:192633 P:68085 E46479' G[71023]='L0 E46479' @@ -38893,8 +38938,8 @@ G[71060]='SP L60 A:195547 T:195547 P:_9C77 E46479' G[71066]='SP L60 A:196707 T:196707 P:_9C711 E46479' G[71067]='SP L60 A:196707 T:196707 P:_9C711 ODC:71050 E46479' G[71073]='SP L60 A:195547 T:195547 P:_9C713 E46479' -G[71074]='L0 E46479' -G[71075]='L0 E46479' +G[71074]='L0 T:196707 E46479' +G[71075]='L0 T:196707 E46479' G[71079]='L0 E46479' G[71083]='L0 E46479' G[71085]='L0 E46479' @@ -38907,37 +38952,38 @@ G[71095]='L0 P:71094 E46479' G[71096]='L0 P:71095 E46479' G[71097]='L0 P:71096 E46479' G[71135]='L67 A:196812 T:196812 P:71000+71012+71017 E46479' -G[71138]='L69 A:189066 P:0 E46479' +G[71138]='L69 A:189066 P:70702+r1520,71146+r1521,71148+r1522,71149+r1523,71150+r1524,71151+r1525 E46479 D152' G[71139]='L0 E46479' -G[71140]='L0 E46479' +G[71140]='K278528 L70 A:-2023 T:-2023 P:a71140 E46479' G[71141]='L0 E46479' G[71143]='FA L0 E46479' G[71144]='FH L0 E46479' -G[71145]='K278528 L0 A:-112024 T:-2024 P:a71145 E46479' -G[71146]='L0 E46479' -G[71148]='L0 E46479' -G[71149]='L0 E46479' -G[71150]='L0 E46479' -G[71151]='L0 E46479' +G[71145]='K278528 L70 A:-112024 T:-2024 P:a71145 E46479' +G[71146]='L69 A:196643 T:189066 P:_9CB10 E46479' +G[71148]='L69 A:196643 T:189066 P:_9CB15 ODC:71187 E46479' +G[71149]='L69 A:196643 T:189066 P:_9CB17 ODC:71188 E46479' +G[71150]='L69 A:196643 T:189066 P:_9CB20 E46479' +G[71151]='L69 A:196643 T:189066 P:_9CB23 E46479' G[71152]='L0 E47187' G[71153]='L0 E46479' G[71154]='L0 E46479' G[71155]='L0 E46479' -G[71156]='L0 E46479' -G[71157]='L69 A:189066 P:0 E46479' +G[71156]='K262144 L70 A:-312025 T:195064 P:a71156 E46479' +G[71157]='L69 A:189066 P:70702+r1520,71146+r1521,71148+r1522,71149+r1523,71150+r1524,71151+r1525 E46479 D152' G[71160]='L0 E46781' -G[71161]='L69 A:189066 P:0 E46479' -G[71162]='L69 A:189066 P:0 E46479' +G[71161]='L69 A:189066 P:70702+r1520,71146+r1521,71148+r1522,71149+r1523,71150+r1524,71151+r1525 E46479 D152' +G[71162]='L69 A:189066 T:189066 P:70702+r1520,71146+r1521,71148+r1522,71149+r1523,71150+r1524,71151+r1525 E46479 D152' G[71164]='L0 E46619' -G[71165]='L69 A:189066 P:0 E46479' -G[71166]='L0 E46479' -G[71178]='L69 A:189066 T:189066 E46479' +G[71165]='L69 A:189066 P:70702+r1520,71146+r1521,71148+r1522,71149+r1523,71150+r1524,71151+r1525 E46479 D152' +G[71166]='K278528 L0 A:-352025 T:-2025 P:a71166 E46479' +G[71178]='L69 A:189066 T:189066 P:70702+r1520,71146+r1521,71148+r1522,71149+r1523,71150+r1524,71151+r1525 E46479 D152' G[71179]='L66 A:701584 P:66252+0 E46479' -- TODO: Yoshimo: not there, guess it's a breadcrumb -G[71180]='L0 E46479' -G[71181]='L0 E46479' +G[71180]='K278528 L0 A:-392025 T:-2025 P:a71180 E46479' +G[71181]='K262144 L70 A:-2025 T:-2025 P:a71181 E46479' G[71182]='L0 RY E46479' +G[71183]='' G[71191]='L0 E46479' -G[71192]='L0 E46479' +G[71192]='K2 L70 A:198766 T:198766 E46479' G[71193]='L0 E46479' G[71194]='L0 E47187' G[71195]='L70 A:701658 T:701658 P:71199+_9C79+c71203 ODC:71203 E46479' @@ -38945,15 +38991,15 @@ G[71196]='L70 A:190014 T:190014 P:66676+_9C79 ODC:71203 E46479' G[71197]='SP L70 A:190014 T:190014 P:71196+_9C79+c71203+)2003150+K10019265820 ODC:71203 E46479' G[71198]='SP L70 A:701649 T:701649 P:71197+_9C79+c71203+)2003150+K10019496610 ODC:71203 E46479' G[71199]='SP L70 A:701650 T:701650 P:71198+_9C79+c71203+)2003150+K10019263620 ODC:71203 E46479' -G[71202]='L0 E46479' +G[71202]='K278528 L0 A:-212024 T:-2024 P:a71202 E46479' G[71203]='T:190014' G[71205]='L0 E47187' G[71206]='K278528 L0 A:-162023 T:-2023 P:a71206 E46479' G[71209]='L70 A:701658 T:701658 P:71195+_9C79 E46479' G[71210]='L69 A:197478 P:_9CE5 E46479' -G[71212]='L0 E46479' +G[71212]='K512 L70 A:-2024 T:-2024 P:a71212 E46479' G[71219]='L64 A:197533 T:191753 I:66448 ODC:66448 E46479' -G[71225]='L0 E46479' +G[71225]='K262400 L0 A:-412025 T:-2025 P:a71225 E46479' G[71226]='L0 E46479' G[71227]='L0 E46479' G[71229]='L60 A:701588 T:185853 P:66684 ODC:72778 E46479' @@ -38977,18 +39023,18 @@ G[71957]='' -- Titan-Touched Serevite Deposit G[71958]='' -- Titan-Touched Draconium Deposit G[71959]='' -- Primal Serevite Deposit ODC:72164 G[71960]='' -- Primal Draconium Deposit -G[72008]='L0 E46479' -G[72019]='L0 E46479' +G[72008]='K262400 L0 A:-242022 T:-2022 P:a72008 E46479' +G[72019]='K262400 L0 A:-192024 T:-2024 P:a72019 E46479' G[72022]='L0 E46479' G[72023]='SP L60 A:189226 T:189226 P:_9CB2 E46479' G[72024]='L0 T:188265 E46479' G[72025]='L0 T:187700 E46479' G[72026]='SP L0 A:189226 T:189226 P:_9CB5 E46479' -G[72028]='L0 E46479' +G[72028]='K262144 L70 A:-402023 T:-2023 P:a72028 E46479' G[72029]='K262144 L0 A:-102025 T:-2025 P:a72029 E46479' -G[72030]='L0 E46619' +G[72030]='K262144 L70 A:-402022 T:-2022 P:a72030 E46619' G[72032]='SP L0 A:189226 T:189226 P:_9CB6 ODC:71415 E46479' -G[72033]='L0 E46479' +G[72033]='L0 T:188265 E46479' G[72034]='L0 E46479' G[72035]='L0 E46479' G[72036]='L0 E46479' @@ -39007,7 +39053,7 @@ G[72048]='L0 E46619' G[72049]='L0 E47213' G[72050]='L0 E46479' G[72052]='L0 E46479' -G[72058]='L0 E46479' +G[72058]='K262400 L0 A:-392023 T:-2023 P:a72058 E46479' G[72060]='L0 E46479' G[72061]='L0 E46479' G[72063]='L62 A:1380859 T:195252 ODC:72064 E46479' @@ -39016,13 +39062,13 @@ G[72067]='L64 A:197986 T:197670 E46479' G[72068]='L0 E46479' G[72069]='L0 E46479' G[72071]='L0 E46479' -G[72072]='L0 E46479' +G[72072]='K2 L70 A:198766 T:198766 E46479' G[72074]='L0 E46479' G[72075]='L0 E47187' G[72079]='L0 E46479' G[72083]='L0 E46479' G[72089]='L61 A:-2022 E46479' -G[72090]='L0 E46781' +G[72090]='K262144 L0 A:-102085 T:-2085 P:a72090 E46781' G[72095]='' -- Yoshimo: happened along side achievement 16581 at around 2023:79.43,84.29 G[72113]='L0 E46479' G[72114]='K32768 L64 A:-2025 E46781' @@ -39034,7 +39080,7 @@ G[72126]='L0 E46479' G[72127]='K32770 L60 A:-2022 E46479' -- TODO: Captain Lancer 2022:26.86,76.08 G[72128]='K2 A:-2170864 T:-864 P:a72128' G[72129]='L0 E46479' -G[72130]='L0 E46479' +G[72130]='K32770 L70 A:-2022 E46479' G[72131]='L0 E46479' G[72134]='L0 E46479' G[72135]='L70 A:193456 E46479' @@ -39044,7 +39090,7 @@ G[72155]='L0 E46479' G[72156]='L0 E46479' G[72157]='L0 E46479' G[72158]='L0 E46479' -G[72159]='L0 E47187' +G[72159]='K262144 L70 A:-192112 T:-2112 P:a72159 E47187' G[72161]='T:187463' G[72166]='K260 L70 A:196191 T:196191 E46479 W012' G[72167]='K260 L70 A:196191 T:196191 E46479 W012' @@ -39066,7 +39112,7 @@ G[72189]='L64 A:189364 T:187300 E46479' G[72190]='L64 A:198349 T:190527 ODC:65041,72258 E46479' G[72191]='L0 E47187' G[72192]='K512 L67 A:191369 P:0 E46479' -- TODO: Yoshimo: is available for E on beta without 66221 -- P:66221 is not correct -G[72193]='L70 A:187676 P:0 E46479' +G[72193]='L70 A:187676 T:187676 P:0 E46479' G[72240]='FA K4096 L60 A:189603 T:189077 P:65101,66577 ODC:72256' G[72241]='K4096 L62 A:192795 T:192795 P:66079 E46479' G[72242]='SP L0 A:190535 T:190535 P:70122 E46479' -- Engineering @@ -39083,26 +39129,31 @@ G[72253]='FH L0 E46479' G[72254]='K32768 L67 A:196812 P:0 E46479' -- TODO: Yoshimo: not appearing for my evoker in beta G[72256]='FH K4096 L60 A:184786 T:197279 P:65613 ODC:72240 E46479' G[72258]='T:190527' -G[72259]='L0 E46479' -G[72260]='L0 E46479' +G[72259]='L0 T:197095 E46479' +G[72260]='L0 T:197095 E46479' G[72261]='L0 E46479' G[72263]='SP A:198429 T:198429 P:65075' +G[72264]='T:196855' +G[72265]='T:184972' G[72266]='L0 E46479' G[72267]='L0 E46479' G[72268]='L0 E46479' G[72269]='L0 E46479' -G[72279]='L0 T:186448 E46479' +G[72271]='T:187767' +G[72273]='T:190496' +G[72274]='T:192767' +G[72279]='SP L60 A:193006 T:193006 P:_9CF1 E46479' G[72280]='L0 E46619' G[72281]='L0 E47187' G[72282]='SP L0 A:193015 T:193015 P:_9CE2 E46479' G[72283]='L0 E46479' G[72284]='L0 E46479' -G[72291]='L0 E46479' +G[72291]='K4 L70 A:-2024 T:186448 E46479' G[72292]='L0 E46479' G[72293]='L0 E46479' G[72294]='L0 E46479' G[72295]='L0 E46479' -G[72296]='L0 E46479' +G[72296]='L0 T:196707 E46479' G[72297]='L0 E46479' G[72298]='L0 E46479' G[72299]='L0 E46479' @@ -39116,7 +39167,7 @@ G[72306]='L0 E46479' G[72307]='L0 E46479' G[72308]='L0 E46479' G[72309]='L0 E47187' -G[72310]='L0 E46479' +G[72310]='L0 T:196707 E46479' G[72311]='L0 E46479' G[72312]='L0 E46479' G[72313]='L0 E46479' @@ -39144,7 +39195,7 @@ G[72334]='L0 E46479' G[72335]='L0 E46479' G[72336]='L0 E46781' G[72337]='L0 E46479' -G[72338]='L0 E46479' +G[72338]='L0 T:187447 E46479' G[72339]='L0 E46479' G[72354]='L70 A:196499 E47187' G[72358]='K32768 L65 A:-2024 E46479' @@ -39153,10 +39204,10 @@ G[72363]='SP L60 A:196707 T:196707 P:_9C77 E46479' G[72364]='L0 E46479' G[72365]='L0 E46479' G[72372]='L0 E46479' -G[72373]='L0 E46479' -G[72374]='L0 E46479' -G[72375]='L0 E46479' -G[72380]='L0 E47187' +G[72373]='K4100 L70 A:196499 T:196499 E46479' +G[72374]='K4100 L70 A:196499 T:196499 P:a72374 E46479' +G[72375]='K4100 L70 A:-342112 T:196499 P:a72375 E46479' +G[72380]='L70 T:187678 E47187' G[72381]='L0 E46479' G[72382]='L0 E46479' G[72383]='L0 E46479' @@ -39186,22 +39237,22 @@ G[72429]='L63 A:191283,195543 T:185179 P:65806 E46479' -- when Sansok Khan moves G[72434]='L0 E46479' G[72435]='L65 A:193006 P:65849 E46479' G[72438]='L0 E47799' -G[72447]='L0 E46479' +G[72447]='K4 L70 A:191193 T:191193 E46479' G[72448]='L0 E46479' G[72456]='L0 E46479' G[72481]='L60 A:193411 T:193411 E46479' -- immediately available when arriving at Dragon Isles -G[72482]='L0 E46479' +G[72482]='L70 A:199120 T:193411 E46479' G[72483]='L0 E46479' -G[72484]='L0 E46479' +G[72484]='L70 A:193411 E46479' G[72485]='L0 E46479' G[72486]='L0 E46479' -G[72487]='L0 E46479' +G[72487]='L0 T:199120 E46479' G[72488]='L0 E46479' G[72512]='L0 E46479' G[72519]='K4096 L67 A:186931 T:186931 P:66032 E46479' G[72524]='L0 E46479' G[72525]='L0 E46479' -G[72528]='K4 L70 A:198695 P:72360 E47799' +G[72528]='K4 L70 A:198695 T:-2025 P:72360 E47799' G[72535]='L0 E46479' G[72536]='L0 E46479' G[72537]='L0 E46479' @@ -39218,7 +39269,7 @@ G[72550]='L0 E46479' G[72555]='L0 E47799' G[72556]='L0 E47799' G[72557]='L0 E47799' -G[72560]='L0 E46479' +G[72560]='K2 L70 A:-2025 E46479' G[72563]='L0 E47799' G[72564]='L0 E47799' G[72565]='L0 E47799' @@ -39240,6 +39291,7 @@ G[72582]='L0 E47799' G[72583]='L0 E47799' G[72584]='L0 P:70793+70871 E46479' -- TODO: Yoshimo: verify 70793 70871 G[72585]='K4096 L67 A:196499 P:71232 E46479' +G[72616]='T:192761' G[72619]='L0 E46479' G[72620]='L0 E46479' G[72621]='L0 E46479' @@ -39264,21 +39316,21 @@ G[72639]='L0 E47187' G[72640]='L0 E47213' G[72641]='L0 E47213' G[72642]='L0 E47213' -G[72646]='L0 E47799' -G[72647]='L0 E47213' -G[72648]='L0 E46479' -G[72649]='L0 E46479' +G[72646]='L0 A:-212112 T:-2112 P:a72646 E47799' +G[72647]='L0 A:-302112 T:-2112 P:a72647 E47213' +G[72648]='L0 A:-202112 T:-2112 P:a72648 E46479' +G[72649]='L0 A:-352112 T:-2112 P:a72649 E46479' G[72669]='L0 T:185556 E46479' G[72671]='L0 E46479' G[72672]='L0 E46479' G[72673]='L0 E46479' G[72682]='L0 E46479' G[72685]='L0 E46479' -G[72686]='L0 E47187' +G[72686]='L70 A:-232112 T:-2112 P:a72686 E47187' G[72687]='L0 E46479' G[72688]='L0 E46479' G[72689]='L0 E47187' -G[72690]='L0 E46479' +G[72690]='L0 T:193015 E46479' G[72691]='L0 E47187' G[72692]='L0 E47187' G[72693]='L0 E46479' @@ -39296,12 +39348,13 @@ G[72708]='T:198846 ODC:64764' -- gotten from "Dragon Isles Supply Bag" which dro G[72709]='N60 A:198846 P:72708' G[72719]='K4 L70 A:199526 E47799' G[72720]='K260 L70 A:199526 T:199526 E46479 W013' +G[72721]='K4 L70 A:199526' G[72722]='K68 L70 A:199526 T:199526 E46479 W013' -G[72723]='K260 L70 A:199526 T:199526 E46479 W013' -G[72724]='L0 E47799' +G[72723]='K260 L70 A:199526 T:199526 E46479 W013' -- should mark as needing Battleground Bonus Event +G[72724]='K4 L70 A:199526 T:199526 E47799' G[72725]='K68 L70 A:199526 T:199526 E46479 W013' G[72728]='K4 L70 A:199526 T:199526 P:66221 E46479 W013' -- only appears when in "World Quest Bonus Event" on the calendar, but you must have opened world quests it seems -G[72729]='L0 E46479' +G[72729]='L0 T:191608 E46479' G[72734]='L0 E47799' G[72738]='L0 E47213' G[72739]='L0 E47799' @@ -39368,7 +39421,7 @@ G[72982]='L0 E47799' G[72984]='L0 E47799' G[72985]='L0 E47799' G[73064]='L0 E47799' -G[73169]='FA L70 A:199261 E47799' +G[73169]='FA L70 A:199261 T:15895 E47799' G[73170]='FH L0 E47799' G[73172]='SP HL L0 A:200747 T:200747 E47799' -- Shikaar Elder G[73192]='L0 E47799' @@ -39381,7 +39434,9 @@ G[73860]='SP HL L0 A:201141 T:201141 E47799' -- Elder Dekidig G[73861]='SP HL L0 A:201143 T:201143 E47799' -- Elder Razlok G[73864]='L0 E47187' G[73917]='T:194240' +G[74040]='T:190986' G[74120]='FA L0 E47799' +G[74225]='T:190986' G[74376]='L0 T:199425 E47799' G[74378]='K262144 L0 A:-132025 T:-2025 P:a74378 E47799' G[74382]='L0 E47187' @@ -39901,7 +39956,8 @@ end -- 47799 10.0.5 2023-01-24 2023-01-24 -- 47825 10.0.5 2023-01-25 2023-01-26* -- 47849 10.0.5 2023-01-26 2023-01-27* --- 47871 10.0.5 2023-01-26 2023-01-28 current live +-- 47871 10.0.5 2023-01-26 2023-01-28 +-- 47936 10.0.5 2023-01-31 2023-02-03* current live -- 35432 9.0.1 2020-08-03 2020-08-06 -- 35482 9.0.1 2020-08-06 2020-08-08 diff --git a/Grail/Grail.lua b/Grail/Grail.lua index c5cf2f1..000d5e0 100644 --- a/Grail/Grail.lua +++ b/Grail/Grail.lua @@ -564,6 +564,7 @@ -- Adds support for POI presence prerequisites. -- Adds support for items with specific counts as prerequisites. -- Changes retail interface to 100005. +-- Adds support group membership completion counts being exact (to support Dragon Isles Waygate quests). -- -- Known Issues -- @@ -4746,6 +4747,8 @@ end, retval = self:ProfessionExceeds(subcode, numeric) and 'C' or 'P' elseif 'R' == code then retval = self:EverExperiencedSpell(numeric) and 'C' or 'P' + elseif 'r' == code then + retval = self:MeetsRequirementGroupControl({groupNumber = subcode, minimum = numeric, inLog = true, turnedIn = true, exactMatch = true }) and 'C' or 'P' elseif 'S' == code then retval = self:_HasSkill(numeric) and 'C' or 'P' elseif 's' == code then @@ -4763,12 +4766,10 @@ end, retval = 'C' end elseif 'V' == code then --- retval = self:MeetsRequirementGroupAccepted(subcode, numeric) and 'C' or 'P' retval = self:MeetsRequirementGroupControl({groupNumber = subcode, minimum = numeric, accepted = true}) and 'C' or 'P' elseif 'v' == code then retval = self:_QuestTurnedInBeforeLastWeeklyReset(numeric) and 'C' or 'P' elseif 'W' == code then --- retval = self:MeetsRequirementGroup(subcode, numeric) and 'C' or 'P' retval = self:MeetsRequirementGroupControl({groupNumber = subcode, minimum = numeric, turnedIn = true}) and 'C' or 'P' elseif 'w' == code then retval = self:MeetsRequirementGroupControl({ groupNumber = subcode, minimum = numeric, turnedIn = true, completeInLog = true}) and 'C' or 'P' @@ -6474,7 +6475,7 @@ end, numeric = tonumber(strsub(questCode, 5)) -- Csssn+ (sss must be numbers) - elseif 'V' == code or 'W' == code or 'w' == code then + elseif 'V' == code or 'W' == code or 'w' == code or 'r' == code then subcode = tonumber(strsub(questCode, 2, 4)) numeric = tonumber(strsub(questCode, 5)) @@ -6880,8 +6881,8 @@ end if nil ~= codeString then local questId = p and p.q or nil local dangerous = p and p.d or false - local questCompleted, questInLog, questStatus, questEverCompleted, canAcceptQuest, spellPresent, achievementComplete, itemPresent, questEverAbandoned, professionGood, questEverAccepted, hasSkill, spellEverCast, spellEverExperienced, groupDone, groupAccepted, reputationUnder, reputationExceeds, factionMatches, phaseMatches, iLvlMatches, garrisonBuildingMatches, needsMatchBoth, levelMeetsOrExceeds, groupDoneOrComplete, achievementNotComplete, levelLessThan, playerAchievementComplete, playerAchievementNotComplete, garrisonBuildingNPCMatches, classMatches, artifactKnowledgeLevelMatches, worldQuestAvailable, friendshipReputationUnder, friendshipReputationExceeds, artifactLevelMatches, missionMatches, threatQuestAvailable, azeriteLevelMatches, renownExceeds, callingQuestAvailable, garrisonTalentResearched, questTurnedIndBeforeLastWeeklyReset, questTurnedIndBeforeTodaysReset, currencyAmountMatches, majorFactionRenownLevelMatches, poiPresent, majorFactionRenownLevelMatchesAccountWide = false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false - local checkLog, checkEver, checkStatusComplete, shouldCheckTurnin, checkSpell, checkAchievement, checkItem, checkItemLack, checkEverAbandoned, checkNeverAbandoned, checkProfession, checkEverAccepted, checkHasSkill, checkNotCompleted, checkNotSpell, checkEverCastSpell, checkEverExperiencedSpell, checkGroupDone, checkGroupAccepted, checkReputationUnder, checkReputationExceeds, checkSkillLack, checkFaction, checkPhase, checkILvl, checkGarrisonBuilding, checkStatusNotComplete, checkLevelMeetsOrExceeds, checkGroupDoneOrComplete, checkAchievementLack, checkLevelLessThan, checkPlayerAchievement, checkPlayerAchievementLack, checkGarrisonBuildingNPC, checkNotTurnin, checkNotLog, checkClass, checkArtifactKnowledgeLevel, checkWorldQuestAvailable, checkFriendshipReputationExceeds, checkFriendshipReputationUnder, checkArtifactLevel, checkMission, checkNever, checkThreatQuestAvailable, checkAzeriteLevel, checkRenownLevel, checkCallingQuestAvailable, checkGarrisonTalent, checkQuestTurnedInBeforeLastWeeklyReset, checkRenownDoesNotMeetOrExceed, checkNotClass, checkQuestTurnedInBeforeTodaysReset, checkCurrencyAmount, checkMajorFactionRenownLevel, checkPOIPresent, checkMajorFactionRenownLevelAccountWide = false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false + local questCompleted, questInLog, questStatus, questEverCompleted, canAcceptQuest, spellPresent, achievementComplete, itemPresent, questEverAbandoned, professionGood, questEverAccepted, hasSkill, spellEverCast, spellEverExperienced, groupDone, groupAccepted, reputationUnder, reputationExceeds, factionMatches, phaseMatches, iLvlMatches, garrisonBuildingMatches, needsMatchBoth, levelMeetsOrExceeds, groupDoneOrComplete, achievementNotComplete, levelLessThan, playerAchievementComplete, playerAchievementNotComplete, garrisonBuildingNPCMatches, classMatches, artifactKnowledgeLevelMatches, worldQuestAvailable, friendshipReputationUnder, friendshipReputationExceeds, artifactLevelMatches, missionMatches, threatQuestAvailable, azeriteLevelMatches, renownExceeds, callingQuestAvailable, garrisonTalentResearched, questTurnedIndBeforeLastWeeklyReset, questTurnedIndBeforeTodaysReset, currencyAmountMatches, majorFactionRenownLevelMatches, poiPresent, majorFactionRenownLevelMatchesAccountWide, groupInLogOrTurnedIn = false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false + local checkLog, checkEver, checkStatusComplete, shouldCheckTurnin, checkSpell, checkAchievement, checkItem, checkItemLack, checkEverAbandoned, checkNeverAbandoned, checkProfession, checkEverAccepted, checkHasSkill, checkNotCompleted, checkNotSpell, checkEverCastSpell, checkEverExperiencedSpell, checkGroupDone, checkGroupAccepted, checkReputationUnder, checkReputationExceeds, checkSkillLack, checkFaction, checkPhase, checkILvl, checkGarrisonBuilding, checkStatusNotComplete, checkLevelMeetsOrExceeds, checkGroupDoneOrComplete, checkAchievementLack, checkLevelLessThan, checkPlayerAchievement, checkPlayerAchievementLack, checkGarrisonBuildingNPC, checkNotTurnin, checkNotLog, checkClass, checkArtifactKnowledgeLevel, checkWorldQuestAvailable, checkFriendshipReputationExceeds, checkFriendshipReputationUnder, checkArtifactLevel, checkMission, checkNever, checkThreatQuestAvailable, checkAzeriteLevel, checkRenownLevel, checkCallingQuestAvailable, checkGarrisonTalent, checkQuestTurnedInBeforeLastWeeklyReset, checkRenownDoesNotMeetOrExceed, checkNotClass, checkQuestTurnedInBeforeTodaysReset, checkCurrencyAmount, checkMajorFactionRenownLevel, checkPOIPresent, checkMajorFactionRenownLevelAccountWide, checkGroupInLogOrTurnedIn = false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false local forcingProfessionOnly, forcingReputationOnly = false, false if forceSpecificChecksOnly then @@ -6948,6 +6949,7 @@ end elseif code == 'Q' or code == 'q' then checkILvl = true elseif code == 'R' then checkEverExperiencedSpell = true + elseif code == 'r' then checkGroupInLogOrTurnedIn = true elseif code == 'S' then checkHasSkill = true elseif code == 's' then checkSkillLack = true elseif code == 'T' then checkReputationExceeds = true @@ -7027,11 +7029,10 @@ end if checkHasSkill or checkSkillLack then hasSkill = Grail:_HasSkill(value) end if checkEverCastSpell then spellEverCast = Grail:_EverCastSpell(value) end if checkEverExperiencedSpell then spellEverExperienced = Grail:EverExperiencedSpell(value) end --- if checkGroupDone then groupDone = Grail:MeetsRequirementGroup(subcode, value) end if checkGroupDone then groupDone = Grail:MeetsRequirementGroupControl({groupNumber = subcode, minimum = value, turnedIn = true}) end if checkGroupDoneOrComplete then groupDoneOrComplete = Grail:MeetsRequirementGroupControl({ groupNumber = subcode, minimum = value, turnedIn = true, completeInLog = true}) end --- if checkGroupAccepted then groupAccepted = Grail:MeetsRequirementGroupAccepted(subcode, value) end if checkGroupAccepted then groupAccepted = Grail:MeetsRequirementGroupControl({groupNumber = subcode, minimum = value, accepted = true}) end + if checkGroupInLogOrTurnedIn then groupInLogOrTurnedIn = Grail:MeetsRequirementGroupControl({groupNumber = subcode, minimum = value, inLog = true, turnedIn = true, exactMatch = true }) end if checkReputationUnder or checkReputationExceeds then local exceeds, earnedValue = Grail:_ReputationExceeds(Grail.reputationMapping[subcode], value) if not exceeds then reputationUnder = true end @@ -7177,7 +7178,8 @@ end (checkCurrencyAmount and currencyAmountMatches) or (checkMajorFactionRenownLevel and majorFactionRenownLevelMatches) or (checkMajorFactionRenownLevelAccountWide and majorFactionRenownLevelMatchesAccountWide) or - (checkPOIPresent and poiPresent) + (checkPOIPresent and poiPresent) or + (checkGroupInLogOrTurnedIn and groupInLogOrTurnedIn) if not good then tinsert(failures, codeString) end end @@ -7195,12 +7197,10 @@ end local code, subcode, numeric = Grail:CodeParts(codeString) local anyFailure = nil if 'V' == code then --- if not Grail:MeetsRequirementGroupAccepted(subcode, numeric) then if not Grail:MeetsRequirementGroupControl({groupNumber = subcode, minimum = numeric, accepted = true}) then anyFailure = Grail.bitMaskInvalidated end elseif 'W' == code then --- if not Grail:MeetsRequirementGroupPossibleToComplete(subcode, numeric) then if not Grail:MeetsRequirementGroupControl({ groupNumber = subcode, minimum = numeric, possible = true}) then anyFailure = Grail.bitMaskInvalidated end @@ -7208,6 +7208,10 @@ end if not Grail:MeetsRequirementGroupControl({ groupNumber = subcode, minimum = numeric, turnedIn = true, completeInLog = true}) then anyFailure = Grail.bitMaskInvalidated end + elseif 'r' == code then + if not Grail:MeetsRequirementGroupControl({groupNumber = subcode, minimum = numeric, inLog = true, turnedIn = true, exactMatch = true }) then + anyFailure = Grail.bitMaskInvalidated + end elseif 'T' == code or 't' == code then local exceeds, earnedValue = Grail:_ReputationExceeds(Grail.reputationMapping[subcode], numeric) if 'T' == code and not exceeds then @@ -9072,7 +9076,9 @@ end -- of the controlTable, which can have in it: -- groupNumber integer number of group for quests (required) -- minimum integer number needing to match (required) + -- exactMatch boolean indicates count must match exactly instead of >= -- turnedIn boolean indicating a match succeeds when quest completed and turned in + -- inLog boolean indicating a match succeeds when quest in log -- completeInLog boolean indicating a match succeeds when quest complete in log -- accepted boolean indicating a match succeeds when quest has been accepted -- possible boolean indicating a match succeeds when quest is not invalidated @@ -9091,6 +9097,10 @@ end if not foundMatch and controlTable.turnedIn then if self:IsQuestCompleted(questId) then foundMatch = true end end + if not foundMatch and controlTable.inLog then + local questInLog, questStatus = Grail:IsQuestInQuestLog(questId) + if questInLog then foundMatch = true end + end if not foundMatch and controlTable.completeInLog then local questInLog, questStatus = Grail:IsQuestInQuestLog(questId) if questInLog and questStatus ~= nil and questStatus > 0 then foundMatch = true end @@ -9104,53 +9114,11 @@ end if foundMatch then numberMatching = numberMatching + 1 end end end - return (numberMatching >= controlTable.minimum) - end, - - MeetsRequirementGroup = function(self, groupNumber, minimumDone) - if not Grail.warnedAboutMeetsRequirementGroup then - print("Grail:MeetsRequirementGroup(g, m) is obsolete (071). Please replace with Grail:MeetsRequirementGroupControl({groupNumber = g, minimum = m, turnedIn = true}) instead.") - Grail.warnedAboutMeetsRequirementGroup = true - end - return self:MeetsRequirementGroupControl({groupNumber = groupNumber, minimum = minimumDone, turnedIn = true}) - end, - - MeetsRequirementGroupAccepted = function(self, groupNumber, minimumAccepted) - if not Grail.warnedAboutMeetsRequirementGroupAccepted then - print("Grail:MeetsRequirementGroupAccepted(g, m) is obsolete (071). Please replace with Grail:MeetsRequirementGroupControl({groupNumber = g, minimum = m, accepted = true}) instead.") - Grail.warnedAboutMeetsRequirementGroupAccepted = true - end - return self:MeetsRequirementGroupControl({groupNumber = groupNumber, minimum = minimumAccepted, accepted = true}) --- local numberAccepted = 0 --- local questTable = self.questStatusCache['G'][groupNumber] or {} --- if #questTable >= minimumAccepted then --- local dailyDay = self:_GetDailyDay() --- local dailyGroup = GrailDatabasePlayer["dailyGroups"][dailyDay] and GrailDatabasePlayer["dailyGroups"][dailyDay][groupNumber] or {} --- for _, questId in pairs(questTable) do --- if tContains(dailyGroup, questId) then --- numberAccepted = numberAccepted + 1 --- end --- end --- end --- return (numberAccepted >= minimumAccepted) - end, - - MeetsRequirementGroupPossibleToComplete = function(self, groupNumber, minimumDone) - if not Grail.warnedAboutMeetsRequirementGroupPossibleToComplete then - print("Grail:MeetsRequirementGroupPossibleToComplete(g, m) is obsolete (071). Please replace with Grail:MeetsRequirementGroupControl({groupNumber = g, minimum = m, possible = true}) instead.") - Grail.warnedAboutMeetsRequirementGroupPossibleToComplete = true + if controlTable.exactMatch then + return (numberMatching == controlTable.minimum) + else + return (numberMatching >= controlTable.minimum) end - return self:MeetsRequirementGroupControl({groupNumber = groupNumber, minimum = minimumDone, possible = true}) --- local numberAvailableToDo = 0 --- local questTable = self.questStatusCache['G'][groupNumber] or {} --- if #questTable >= numberAvailableToDo then --- for _, questId in pairs(questTable) do --- if not self:IsInvalidated(questId) then --- numberAvailableToDo = numberAvailableToDo + 1 --- end --- end --- end --- return (numberAvailableToDo >= minimumDone) end, ---