From 01a351a865fa0ef5be82064068dff73d0ad85abf Mon Sep 17 00:00:00 2001 From: rope Date: Wed, 11 Nov 2026 10:13:45 +0000 Subject: [PATCH] DungeonPreQuest: mark dungeon quests too, refresh QuestieDB data Co-Authored-By: Claude Opus 5.5 --- DungeonPreQuest/Data.lua | 327 +++++++++++++++++++++++++++- DungeonPreQuest/DungeonPreQuest.lua | 52 +++-- DungeonPreQuest/DungeonPreQuest.toc | 2 +- DungeonPreQuest/Minimap.lua | 12 +- DungeonPreQuest/PinData.lua | 184 +++++++++++++++- DungeonPreQuest/tools/generate.lua | 77 ++++--- QuestShoppingList/Data.lua | 22 +- README.md | 2 +- tests/test_dpq.lua | 17 ++ tests/test_dpq_minimap.lua | 3 +- 10 files changed, 628 insertions(+), 70 deletions(-) diff --git a/DungeonPreQuest/Data.lua b/DungeonPreQuest/Data.lua index 7f963c9..bdb1f96 100644 --- a/DungeonPreQuest/Data.lua +++ b/DungeonPreQuest/Data.lua @@ -1,5 +1,7 @@ -- Generated from QuestieDB's Forever quest data. Do not edit. --- quests[id] = { dungeon, faction, classes, ... }; faction 1 Alliance, 2 Horde, 3 both; classes 0 = all; dungeon 0 = unnamed. +-- quests[id] = { dungeon, faction, classes, ... } for the dungeons a quest leads to; +-- dungeonQuests[id] the same for the dungeon a quest is done in. +-- faction 1 Alliance, 2 Horde, 3 both; classes 0 = all; dungeon 0 = unnamed. local _, ns = ... ns.dungeons = { @@ -368,3 +370,326 @@ ns.quests = { [92751]={14,1,0}, [92752]={14,1,0}, } + +ns.dungeonQuests = { + [17]={17,1,0}, + [166]={14,1,0}, + [167]={14,1,0}, + [168]={14,1,0}, + [214]={14,1,0}, + [377]={15,1,0}, + [378]={15,1,0}, + [386]={15,1,0}, + [387]={15,1,0}, + [388]={15,1,0}, + [391]={15,1,0}, + [704]={17,1,0}, + [709]={17,3,0}, + [722]={17,1,0}, + [914]={18,2,0}, + [959]={18,3,0}, + [962]={18,2,0}, + [971]={1,1,0}, + [1013]={12,2,0}, + [1014]={12,2,0}, + [1048]={10,2,0}, + [1049]={10,2,0}, + [1050]={10,1,0}, + [1051]={10,2,0}, + [1053]={10,1,0}, + [1101]={9,1,0}, + [1102]={9,2,0}, + [1109]={9,2,0}, + [1113]={10,2,0}, + [1139]={17,1,0}, + [1142]={9,1,0}, + [1144]={9,3,0}, + [1160]={10,2,0}, + [1193]={4,3,0}, + [1199]={1,1,0}, + [1200]={1,1,0}, + [1221]={9,3,0}, + [1275]={1,1,0}, + [1318]={4,3,0}, + [1360]={17,1,0}, + [1442]={0,1,2}, + [1445]={16,2,0}, + [1446]={16,3,0}, + [1475]={16,1,0}, + [1486]={18,3,0}, + [1487]={18,3,0}, + [1491]={18,3,0}, + [1654]={0,1,2}, + [1740]={0,3,256}, + [1951]={0,3,128}, + [1956]={0,3,128}, + [2040]={14,1,0}, + [2199]={17,1,0}, + [2201]={17,1,0}, + [2202]={17,2,0}, + [2204]={17,1,0}, + [2240]={17,1,0}, + [2278]={17,3,0}, + [2283]={17,2,0}, + [2339]={17,2,0}, + [2342]={17,2,0}, + [2418]={17,3,0}, + [2768]={19,3,0}, + [2770]={19,3,0}, + [2841]={5,2,0}, + [2843]={5,2,0}, + [2846]={19,3,0}, + [2865]={19,3,0}, + [2904]={5,3,0}, + [2922]={5,1,0}, + [2924]={5,1,0}, + [2926]={5,1,0}, + [2928]={5,1,0}, + [2929]={5,1,0}, + [2930]={5,1,0}, + [2936]={19,2,0}, + [2945]={5,3,0}, + [2951]={5,3,0}, + [2952]={5,3,0}, + [2953]={5,3,0}, + [2962]={5,1,0}, + [2991]={19,1,0}, + [3042]={19,3,0}, + [3341]={8,2,0}, + [3373]={16,3,0}, + [3375]={17,1,0}, + [3446]={16,3,0}, + [3447]={16,3,0}, + [3525]={8,3,0}, + [3527]={19,3,0}, + [3528]={16,3,0}, + [3636]={8,1,0}, + [3802]={2,3,0}, + [3906]={0,2,0}, + [3907]={2,2,0}, + [3982]={2,2,0}, + [4001]={2,2,0}, + [4003]={2,2,0}, + [4024]={2,3,0}, + [4063]={2,2,0}, + [4081]={2,2,0}, + [4082]={2,2,0}, + [4083]={2,3,0}, + [4121]={2,2,0}, + [4123]={2,3,0}, + [4126]={2,1,0}, + [4132]={2,2,0}, + [4134]={2,2,0}, + [4136]={2,3,0}, + [4143]={0,1,0}, + [4148]={0,2,0}, + [4201]={2,3,0}, + [4262]={0,1,0}, + [4263]={2,1,0}, + [4282]={2,1,0}, + [4286]={2,1,0}, + [4295]={2,3,0}, + [4322]={2,1,0}, + [4342]={2,1,0}, + [4362]={2,1,0}, + [4601]={5,3,0}, + [4602]={5,3,0}, + [4603]={5,3,0}, + [4604]={5,3,0}, + [4605]={5,3,0}, + [4606]={5,3,0}, + [4701]={3,1,0}, + [4724]={3,2,0}, + [4729]={3,3,0}, + [4734]={3,3,0}, + [4735]={3,3,0}, + [4742]={3,3,0}, + [4743]={3,3,0}, + [4764]={3,1,0}, + [4768]={3,2,0}, + [4771]={11,3,0}, + [4788]={3,3,0}, + [4862]={3,3,0}, + [4866]={3,3,0}, + [4867]={3,3,0}, + [4903]={3,2,0}, + [4974]={3,2,0}, + [4982]={3,2,0}, + [5001]={3,1,0}, + [5081]={3,1,0}, + [5102]={3,1,0}, + [5122]={13,3,0}, + [5127]={3,3,0}, + [5212]={13,3,0}, + [5213]={13,3,0}, + [5214]={13,3,0}, + [5243]={13,3,0}, + [5251]={13,3,0}, + [5263]={13,3,0}, + [5282]={13,3,0}, + [5305]={0,3,0}, + [5306]={0,3,0}, + [5307]={0,3,0}, + [5341]={11,2,0}, + [5343]={11,1,0}, + [5382]={11,3,0}, + [5384]={11,3,0}, + [5463]={13,3,0}, + [5466]={11,3,0}, + [5515]={11,3,0}, + [5518]={4,3,0}, + [5519]={4,3,0}, + [5525]={4,3,0}, + [5526]={0,3,0}, + [5529]={11,3,0}, + [5723]={7,2,0}, + [5725]={7,2,0}, + [5728]={7,2,0}, + [5761]={7,2,0}, + [5848]={13,3,0}, + [6163]={13,2,0}, + [6502]={3,1,0}, + [6521]={8,2,0}, + [6561]={1,2,0}, + [6563]={1,2,0}, + [6565]={1,2,0}, + [6569]={3,2,0}, + [6602]={3,2,0}, + [6626]={8,3,0}, + [6921]={1,2,0}, + [6981]={18,3,0}, + [7028]={6,3,0}, + [7029]={6,2,0}, + [7041]={6,1,0}, + [7044]={6,3,0}, + [7046]={6,3,0}, + [7064]={6,2,0}, + [7065]={6,1,0}, + [7067]={6,3,0}, + [7068]={6,2,0}, + [7070]={6,1,0}, + [7201]={2,2,0}, + [7429]={4,3,0}, + [7441]={4,3,0}, + [7461]={4,3,0}, + [7462]={4,1,0}, + [7463]={0,3,128}, + [7481]={4,2,0}, + [7482]={4,1,0}, + [7483]={4,3,0}, + [7484]={4,3,0}, + [7485]={4,3,0}, + [7488]={4,1,0}, + [7489]={4,2,0}, + [7581]={0,3,256}, + [7604]={2,3,0}, + [7629]={0,3,256}, + [7631]={0,3,256}, + [7642]={0,1,2}, + [7643]={0,1,2}, + [7647]={0,1,2}, + [7668]={0,2,64}, + [7703]={4,3,0}, + [7737]={0,3,0}, + [7761]={3,3,0}, + [7877]={4,3,0}, + [8232]={0,3,4}, + [8236]={0,3,8}, + [8253]={0,3,128}, + [8257]={0,3,16}, + [8258]={0,2,64}, + [8413]={0,2,64}, + [8418]={0,1,2}, + [8422]={0,3,256}, + [8425]={0,3,1}, + [8905]={0,1,1024}, + [8906]={0,1,4}, + [8907]={0,1,128}, + [8908]={0,1,2}, + [8909]={0,1,16}, + [8910]={0,1,8}, + [8911]={0,1,256}, + [8912]={0,1,1}, + [8913]={0,2,1024}, + [8914]={0,2,4}, + [8915]={0,2,128}, + [8916]={0,2,16}, + [8917]={0,2,8}, + [8918]={0,2,64}, + [8919]={0,2,256}, + [8920]={0,2,1}, + [8926]={0,1,1024}, + [8927]={0,2,1024}, + [8931]={0,1,4}, + [8932]={0,1,128}, + [8933]={0,1,2}, + [8934]={0,1,16}, + [8935]={0,1,8}, + [8936]={0,1,256}, + [8937]={0,1,1}, + [8938]={0,2,4}, + [8939]={0,2,128}, + [8940]={0,2,16}, + [8941]={0,2,8}, + [8942]={0,2,64}, + [8943]={0,2,256}, + [8944]={0,2,1}, + [8945]={13,3,0}, + [8949]={4,3,0}, + [8950]={4,3,0}, + [8951]={0,1,1024}, + [8952]={0,1,4}, + [8953]={0,1,128}, + [8954]={0,1,2}, + [8955]={0,1,16}, + [8956]={0,1,8}, + [8957]={0,2,64}, + [8958]={0,1,256}, + [8959]={0,1,1}, + [8966]={3,3,0}, + [8967]={4,3,0}, + [8968]={13,3,0}, + [8969]={11,3,0}, + [8989]={3,3,0}, + [8990]={4,3,0}, + [8991]={13,3,0}, + [8992]={11,3,0}, + [8995]={3,3,0}, + [8999]={0,1,1024}, + [9000]={0,1,4}, + [9001]={0,1,128}, + [9002]={0,1,2}, + [9003]={0,1,16}, + [9004]={0,1,8}, + [9005]={0,1,256}, + [9006]={0,1,1}, + [9007]={0,2,1024}, + [9008]={0,2,4}, + [9009]={0,2,16}, + [9010]={0,2,8}, + [9011]={0,2,64}, + [9012]={0,2,256}, + [9013]={0,2,1}, + [9014]={0,2,128}, + [9015]={2,3,0}, + [9016]={0,2,1024}, + [9017]={0,2,4}, + [9018]={0,2,128}, + [9019]={0,2,16}, + [9020]={0,2,8}, + [9021]={0,2,256}, + [9022]={0,2,1}, + [9053]={0,3,1024}, + [9257]={0,3,16}, + [9269]={0,3,1024}, + [9270]={0,3,128}, + [9271]={0,3,256}, + [92753]={14,1,0}, + [96770]={19,1,0}, + [96773]={8,1,0}, + [96775]={19,2,0}, + [96776]={6,2,0}, + [96800]={10,1,0}, + [97196]={8,2,0}, + [97197]={2,2,0}, +} diff --git a/DungeonPreQuest/DungeonPreQuest.lua b/DungeonPreQuest/DungeonPreQuest.lua index 958e43f..d2ccd07 100644 --- a/DungeonPreQuest/DungeonPreQuest.lua +++ b/DungeonPreQuest/DungeonPreQuest.lua @@ -1,11 +1,12 @@ --- Dungeon Pre-Quest: marks quests whose chain leads to a dungeon quest, in the --- quest log and on the quest offer window. The client has no chain data, so +-- Dungeon Pre-Quest: marks dungeon quests and quests whose chain leads to one, +-- in the quest log and on the quest offer window. The client has no chain data, so -- Data.lua is generated ahead of time. local _, ns = ... local COLOR = "|cffffd100" local LABEL = "Dungeon pre-quest" +local DUNGEON_LABEL = "Dungeon quest" local ROW_MARK = "|cffc77dff[D]|r" local ROW_MARK_GAP = 5 @@ -13,10 +14,10 @@ local function HasClass(mask, classID) return mask == 0 or math.floor(mask / 2 ^ (classID - 1)) % 2 == 1 end --- Dungeon names this quest leads to for this character, or nil if none. --- An empty list means a dungeon quest whose dungeon isn't known. -local function DungeonsFor(questID) - local row = questID and ns.quests[questID] +-- Dungeon names from one of the generated tables that apply to this +-- character, or nil if none. An empty list means a dungeon that isn't known. +local function Match(tbl, questID) + local row = questID and tbl and tbl[questID] if not row then return nil end @@ -43,19 +44,28 @@ local function DungeonsFor(questID) return matched and names or nil end -local function Describe(names) +local function Label(label, names) if #names == 0 then - return LABEL + return label end - return LABEL .. ": " .. table.concat(names, ", ") + return label .. ": " .. table.concat(names, ", ") +end + +-- What to say about a quest for this character, or nil if it isn't one of +-- ours: a quest done inside a dungeon, a step towards one, or both. +local function Describe(questID) + local own = Match(ns.dungeonQuests, questID) + local leads = Match(ns.quests, questID) + if own and leads then + return Label(DUNGEON_LABEL, own) .. "\n" .. Label(LABEL, leads) + end + return own and Label(DUNGEON_LABEL, own) or leads and Label(LABEL, leads) or nil end -ns.DungeonsFor = DungeonsFor ns.Describe = Describe local function MarkRow(button) - local names = DungeonsFor(button.questID) - if not names then + if not Describe(button.questID) then if button.dpqMark then button.dpqMark:Hide() end @@ -88,7 +98,7 @@ end local LIST_MARK = "|cff8a2be2[D]|r " local function MarkListButton(button, questID) - if not DungeonsFor(questID) then + if not Describe(questID) then return false end local text = button:GetText() @@ -116,9 +126,9 @@ local function UpdateBanner() if not banner then return end - local names = DungeonsFor(GetQuestID()) - if names then - banner:SetText(COLOR .. Describe(names) .. "|r") + local text = Describe(GetQuestID()) + if text then + banner:SetText(COLOR .. text .. "|r") banner:Show() else banner:Hide() @@ -129,9 +139,9 @@ local function Setup() hooksecurefunc("QuestLogQuests_Update", UpdateRows) EventRegistry:RegisterCallback("QuestMapLogTitleButton.OnEnter", function(_, button, questID) - local names = DungeonsFor(questID or (button and button.questID)) - if names then - GameTooltip:AddLine(Describe(names), 1, 0.82, 0, true) + local text = Describe(questID or (button and button.questID)) + if text then + GameTooltip:AddLine(text, 1, 0.82, 0, true) GameTooltip:Show() end end, ns) @@ -170,6 +180,6 @@ end) SLASH_DUNGEONPREQUEST1 = "/dpq" SlashCmdList.DUNGEONPREQUEST = function(text) local id = tonumber(text) - local names = DungeonsFor(id) - DEFAULT_CHAT_FRAME:AddMessage(COLOR .. "DungeonPreQuest:|r " .. (id and (names and Describe(names) or "not a pre-quest for you") or "usage: /dpq questID")) + local text = Describe(id) + DEFAULT_CHAT_FRAME:AddMessage(COLOR .. "DungeonPreQuest:|r " .. (id and (text or "not a dungeon quest for you") or "usage: /dpq questID")) end diff --git a/DungeonPreQuest/DungeonPreQuest.toc b/DungeonPreQuest/DungeonPreQuest.toc index fe2db27..9caf610 100644 --- a/DungeonPreQuest/DungeonPreQuest.toc +++ b/DungeonPreQuest/DungeonPreQuest.toc @@ -1,6 +1,6 @@ ## Interface: 16001 ## Title: Dungeon Pre-Quest -## Notes: Marks quests whose chain leads to a dungeon quest. +## Notes: Marks dungeon quests and the quests whose chain leads to one. ## Version: 1.1 Libs\LibStub\LibStub.lua diff --git a/DungeonPreQuest/Minimap.lua b/DungeonPreQuest/Minimap.lua index 349442b..89493c1 100644 --- a/DungeonPreQuest/Minimap.lua +++ b/DungeonPreQuest/Minimap.lua @@ -1,5 +1,5 @@ --- Purple "!" minimap markers on quest givers offering a dungeon pre-quest you --- can pick up right now. The game's own "!" icons can't be recoloured per quest, +-- Purple "!" minimap markers on quest givers offering a dungeon quest or pre-quest +-- you can pick up right now. The game's own "!" icons can't be recoloured per quest, -- so these are separate pins placed on top. local _, ns = ... @@ -68,11 +68,11 @@ local function CanPickUp(id, quest, level, raceBit, classBit) end local function ShowTooltip(pin) - local names = ns.DungeonsFor(pin.questID) + local text = ns.Describe(pin.questID) GameTooltip:SetOwner(pin, "ANCHOR_RIGHT") GameTooltip:SetText(ns.pinQuests[pin.questID].n) - if names then - GameTooltip:AddLine(ns.Describe(names), 1, 0.82, 0, true) + if text then + GameTooltip:AddLine(text, 1, 0.82, 0, true) end GameTooltip:Show() end @@ -112,7 +112,7 @@ local function Refresh() local classBit = 2 ^ (select(3, UnitClass("player")) - 1) for id, quest in pairs(ns.pinQuests) do - if ns.DungeonsFor(id) and CanPickUp(id, quest, level, raceBit, classBit) then + if ns.Describe(id) and CanPickUp(id, quest, level, raceBit, classBit) then local spawns = quest.s for i = 1, #spawns, 3 do local pin = AcquirePin() diff --git a/DungeonPreQuest/PinData.lua b/DungeonPreQuest/PinData.lua index 794112e..515c579 100644 --- a/DungeonPreQuest/PinData.lua +++ b/DungeonPreQuest/PinData.lua @@ -4,18 +4,32 @@ local _, ns = ... ns.raceBits = {[1]=1,[2]=2,[3]=4,[4]=8,[5]=16,[6]=32,[7]=64,[8]=128,[9]=256,[10]=512,[11]=1024,[22]=2097152,[24]=8388608,[25]=16777216,[26]=33554432,[95]=4294967296,[96]=8589934592,} ns.pinQuests = { +[17]={n="Uldaman Reagent Run",l=38,r=4294967373,c=0,p={2500},g=nil,x=nil,nx=0,b=0,s={1432,0.3707,0.4938}}, [65]={n="The Defias Brotherhood",l=14,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=132,b=0,s={1436,0.5633,0.4752}}, [132]={n="The Defias Brotherhood",l=14,r=4294967373,c=0,p={65},g=nil,x=nil,nx=135,b=0,s={1433,0.2139,0.4535}}, [135]={n="The Defias Brotherhood",l=14,r=4294967373,c=0,p={132},g=nil,x=nil,nx=141,b=0,s={1436,0.5633,0.4752}}, [141]={n="The Defias Brotherhood",l=14,r=4294967373,c=0,p={135},g=nil,x=nil,nx=142,b=0,s={1453,0.7831,0.7074}}, [142]={n="The Defias Brotherhood",l=14,r=4294967373,c=0,p={141},g=nil,x=nil,nx=155,b=0,s={1436,0.5633,0.4752}}, [155]={n="The Defias Brotherhood",l=14,r=4294967373,c=0,p={142},g=nil,x=nil,nx=166,b=0,s={1436,0.5568,0.4750}}, +[166]={n="The Defias Brotherhood",l=14,r=4294967373,c=0,p={155},g=nil,x=nil,nx=0,b=0,s={1436,0.5633,0.4752}}, +[167]={n="Oh Brother. . .",l=15,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.7031,0.4082}}, +[168]={n="Collecting Memories",l=14,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.7031,0.4082}}, +[214]={n="Red Silk Bandanas",l=14,r=4294967373,c=0,p={155},g=nil,x=nil,nx=0,b=0,s={1436,0.5667,0.4735}}, [261]={n="Down the Scarlet Path",l=34,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=1052,b=0,s={1443,0.6652,0.0791}}, -[303]={n="The Dark Iron War",l=25,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=378,b=0,s={1437,0.4967,0.1823}}, +[303]={n="The Dark Iron War",l=22,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=378,b=0,s={1437,0.4967,0.1823}}, +[377]={n="Crime and Punishment",l=22,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1431,0.7192,0.4779}}, +[378]={n="The Fury Runs Deep",l=22,r=4294967373,c=0,p={303},g=nil,x=nil,nx=0,b=0,s={1437,0.4967,0.1823}}, +[386]={n="What Comes Around...",l=22,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1433,0.2117,0.4658}}, +[387]={n="Quell The Uprising",l=22,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.5149,0.6938}}, +[388]={n="The Color of Blood",l=22,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.7642,0.6367}}, [389]={n="Bazil Thredd",l=16,r=4294967373,c=0,p={373},g=nil,x=nil,nx=391,b=0,s={1453,0.5774,0.4786}}, +[391]={n="The Stockade Riots",l=16,r=4294967373,c=0,p={389},g=nil,x=nil,nx=392,b=0,s={1453,0.5149,0.6938}}, +[704]={n="Agmond's Fate",l=30,r=4294967373,c=0,p={739},g=nil,x=nil,nx=0,b=0,s={1432,0.6593,0.6562}}, [707]={n="Ironband Wants You!",l=30,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=738,b=738,s={1455,0.7464,0.1174}}, +[709]={n="Solution to Doom",l=30,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1418,0.5139,0.7687}}, [720]={n="A Sign of Hope",l=35,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=721,b=0,s={1418,0.5303,0.3394}}, [721]={n="A Sign of Hope",l=35,r=4294967373,c=0,p={720},g=nil,x=nil,nx=722,b=0,s={1418,0.5342,0.4339}}, +[722]={n="Amulet of Secrets",l=35,r=4294967373,c=0,p={721},g=nil,x=nil,nx=723,b=0,s={1418,0.3790,0.1059}}, [723]={n="Prospect of Faith",l=35,r=4294967373,c=0,p={722},g=nil,x=nil,nx=724,b=0,s={1418,0.3790,0.1059}}, [724]={n="Prospect of Faith",l=35,r=4294967373,c=0,p={723},g=nil,x=nil,nx=725,b=0,s={1418,0.5342,0.4339}}, [725]={n="Passing Word of a Threat",l=35,r=4294967373,c=0,p={724},g=nil,x=nil,nx=726,b=0,s={1455,0.7754,0.1182}}, @@ -28,63 +42,116 @@ ns.pinQuests = { [877]={n="The Stagnant Oasis",l=10,r=8589934770,c=0,p={870},g=nil,x=nil,nx=880,b=0,s={1413,0.5226,0.3193}}, [880]={n="Altered Beings",l=10,r=8589934770,c=0,p={877},g=nil,x=nil,nx=0,b=0,s={1413,0.5226,0.3193}}, [886]={n="The Barrens Oases",l=10,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=870,b=870,s={1456,0.7862,0.2856}}, +[914]={n="Leaders of the Fang",l=11,r=8589934770,c=0,p={1490},g=nil,x=nil,nx=0,b=0,s={1456,0.7565,0.3161}}, +[959]={n="Trouble at the Docks",l=14,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1413,0.6309,0.3761}}, +[962]={n="Serpentbloom",l=14,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1456,0.2281,0.2089}}, +[1013]={n="The Book of Ur",l=16,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1458,0.5374,0.5446}}, +[1014]={n="Arugal Must Die",l=18,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1421,0.4420,0.3981}}, +[1048]={n="Into The Scarlet Monastery",l=33,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1458,0.5625,0.9220}}, +[1049]={n="Compendium of the Fallen",l=28,r=162,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1456,0.3440,0.4687}}, +[1050]={n="Mythology of the Titans",l=28,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1455,0.7497,0.1248}}, [1052]={n="Down the Scarlet Path",l=34,r=4294967373,c=0,p={261},g=nil,x=nil,nx=1053,b=0,s={1443,0.6652,0.0791}}, +[1053]={n="In the Name of the Light",l=34,r=4294967373,c=0,p={1052},g=nil,x=nil,nx=0,b=0,s={1424,0.5147,0.5835}}, +[1101]={n="The Crone of the Kraul",l=29,r=4294967373,c=0,p={1100},g=nil,x=nil,nx=0,b=0,s={1444,0.8964,0.4657}}, +[1102]={n="A Vengeful Fate",l=29,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1456,0.3597,0.5992}}, [1109]={n="Going, Going, Guano!",l=30,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=1113,b=0,s={1458,0.4882,0.6928}}, +[1113]={n="Hearts of Zeal",l=30,r=8589934770,c=0,p={1109},g=nil,x=nil,nx=0,b=0,s={1458,0.4882,0.6928}}, +[1139]={n="The Lost Tablets of Will",l=35,r=4294967373,c=0,p={762},g=nil,x=nil,nx=0,b=0,s={1455,0.7734,0.0971}}, [1149]={n="Test of Faith",l=25,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=1150,b=0,s={1441,0.5395,0.4149}}, [1150]={n="Test of Endurance",l=25,r=8589934770,c=0,p={1149},g=nil,x=nil,nx=1151,b=0,s={1441,0.5395,0.4149}}, [1151]={n="Test of Strength",l=25,r=8589934770,c=0,p={1150},g=nil,x=nil,nx=1152,b=0,s={1441,0.5395,0.4149}}, [1152]={n="Test of Lore",l=25,r=8589934770,c=0,p={1151},g=nil,x=nil,nx=1154,b=0,s={1441,0.5395,0.4149}}, [1154]={n="Test of Lore",l=25,r=8589934770,c=0,p={1152},g=nil,x=nil,nx=6627,b=0,s={1442,0.7880,0.4569}}, [1159]={n="Test of Lore",l=25,r=8589934770,c=0,p={6627},g=nil,x=nil,nx=1160,b=0,s={1442,0.7880,0.4569}}, +[1160]={n="Test of Lore",l=25,r=8589934770,c=0,p={1159},g=nil,x=nil,nx=6628,b=0,s={1458,0.5780,0.6542}}, [1198]={n="In Search of Thaelrid",l=18,r=0,c=0,p=nil,g=nil,x=nil,nx=1200,b=0,s={1457,0.5536,0.2503}}, +[1199]={n="Twilight Falls",l=20,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1457,0.5524,0.2399}}, +[1221]={n="Blueleaf Tubers",l=20,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1413,0.6237,0.3762}}, +[1275]={n="Researching the Corruption",l=18,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1439,0.3833,0.4304}}, +[1360]={n="Reclaimed Treasures",l=33,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1455,0.7419,0.0939}}, [1424]={n="Pool of Tears",l=38,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=1429,b=0,s={1435,0.4793,0.5478}}, [1429]={n="The Atal'ai Exile",l=38,r=8589934770,c=0,p={1424},g=nil,x=nil,nx=1444,b=0,s={1435,0.4793,0.5478}}, [1444]={n="Return to Fel'Zerul",l=38,r=8589934770,c=0,p={1429},g=nil,x=nil,nx=1445,b=0,s={1425,0.3375,0.7521}}, +[1445]={n="The Temple of Atal'Hakkar",l=38,r=8589934770,c=0,p={1444},g=nil,x=nil,nx=0,b=0,s={1435,0.4793,0.5478}}, +[1446]={n="Jammal'an the Prophet",l=38,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1425,0.3375,0.7521}}, [1448]={n="In Search of The Temple",l=38,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=1449,b=0,s={1453,0.6945,0.4040}}, [1449]={n="To The Hinterlands",l=38,r=4294967373,c=0,p={1448},g=nil,x=nil,nx=1450,b=0,s={1453,0.6945,0.4040}}, [1450]={n="Gryphon Master Talonaxe",l=38,r=4294967373,c=0,p={1449},g=nil,x=nil,nx=1451,b=0,s={1425,0.1181,0.4676}}, [1451]={n="Rhapsody Shindigger",l=38,r=4294967373,c=0,p={1450},g=nil,x=nil,nx=1452,b=0,s={1425,0.0975,0.4447}}, [1452]={n="Rhapsody's Kalimdor Kocktail",l=38,r=4294967373,c=0,p={1451},g=nil,x=nil,nx=1469,b=0,s={1425,0.2694,0.4859}}, [1469]={n="Rhapsody's Tale",l=38,r=4294967373,c=0,p={1452},g=nil,x=nil,nx=1475,b=0,s={1425,0.2694,0.4859}}, +[1475]={n="Into The Temple of Atal'Hakkar",l=41,r=4294967373,c=0,p={1469},g=nil,x=nil,nx=0,b=0,s={1453,0.6945,0.4040}}, +[1486]={n="Deviate Hides",l=13,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1413,0.4599,0.3566}}, +[1487]={n="Deviate Eradication",l=15,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1413,0.4601,0.3574}}, [1489]={n="Hamuul Runetotem",l=12,r=8589934770,c=0,p={880},g=nil,x=nil,nx=1490,b=0,s={1413,0.5226,0.3193}}, [1490]={n="Nara Wildmane",l=12,r=8589934770,c=0,p={1489},g=nil,x=nil,nx=914,b=0,s={1456,0.7862,0.2856}}, +[1491]={n="Smart Drinks",l=13,r=0,c=0,p={865},g=nil,x=nil,nx=0,b=0,s={1413,0.6237,0.3762}}, [1650]={n="The Tome of Valor",l=20,r=5,c=2,p={1649},g=nil,x=nil,nx=1651,b=0,s={1453,0.5048,0.4749}}, [1651]={n="The Tome of Valor",l=20,r=5,c=2,p={1650},g=nil,x=nil,nx=1652,b=0,s={1436,0.4169,0.8924}}, [1652]={n="The Tome of Valor",l=20,r=5,c=2,p={1651},g=nil,x=nil,nx=1653,b=0,s={1436,0.4169,0.8924}}, [1653]={n="The Test of Righteousness",l=20,r=5,c=2,p={1652},g=nil,x=nil,nx=1654,b=0,s={1453,0.5048,0.4749}}, +[1654]={n="The Test of Righteousness",l=20,r=5,c=2,p={1653},g=nil,x=nil,nx=1806,b=0,s={1426,0.5249,0.3692}}, +[1740]={n="The Orb of Soran'ruk",l=20,r=0,c=256,p=nil,g=nil,x=nil,nx=0,b=0,s={1413,0.4931,0.5721}}, [1947]={n="Journey to the Marsh",l=30,r=0,c=128,p=nil,g=nil,x=nil,nx=0,b=0,s={1456,0.2570,0.1419,1458,0.8514,0.1003,1454,0.3845,0.8613,1455,0.2725,0.0830,1453,0.4956,0.8580}}, [1949]={n="Hidden Secrets",l=30,r=0,c=128,p={1947},g=nil,x=nil,nx=1950,b=0,s={1445,0.4606,0.5709}}, [1950]={n="Get the Scoop",l=30,r=0,c=128,p={1949},g=nil,x=nil,nx=1951,b=0,s={1441,0.7829,0.7570}}, +[1951]={n="Rituals of Power",l=30,r=0,c=128,p={1950},g=nil,x=nil,nx=0,b=0,s={1441,0.7829,0.7570}}, [1953]={n="Return to the Marsh",l=35,r=0,c=128,p=nil,g=nil,x=nil,nx=1954,b=1954,s={1456,0.2570,0.1419,1458,0.8514,0.1003,1454,0.3845,0.8613,1455,0.2725,0.0830,1453,0.4956,0.8580}}, [1954]={n="The Infernal Orb",l=35,r=0,c=128,p=nil,g=nil,x=nil,nx=1955,b=0,s={1445,0.4606,0.5709}}, [1955]={n="The Exorcism",l=35,r=0,c=128,p={1954},g=nil,x=nil,nx=1956,b=0,s={1445,0.4606,0.5709}}, +[1956]={n="Power in Uldaman",l=35,r=0,c=128,p={1955},g=nil,x=nil,nx=1957,b=0,s={1445,0.4606,0.5709}}, +[2040]={n="Underground Assault",l=15,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.6263,0.3411}}, [2041]={n="Speak with Shoni",l=15,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2040,b=2040,s={1455,0.6918,0.5055}}, +[2199]={n="Lore for a Price",l=37,r=4294967373,c=0,p={2198},g=nil,x=nil,nx=2200,b=0,s={1455,0.3638,0.0361}}, [2200]={n="Back to Uldaman",l=37,r=4294967373,c=0,p={2199},g=nil,x=nil,nx=2201,b=0,s={1455,0.3638,0.0361}}, +[2202]={n="Uldaman Reagent Run",l=36,r=8589934770,c=0,p={2258},g=nil,x=nil,nx=2203,b=0,s={1418,0.0242,0.4606}}, [2258]={n="Badlands Reagent Run",l=36,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=2202,b=0,s={1418,0.0242,0.4606}}, +[2283]={n="Necklace Recovery",l=37,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=2284,b=0,s={1454,0.5949,0.3657}}, [2284]={n="Necklace Recovery, Take 2",l=37,r=8589934770,c=0,p={2283},g=nil,x=nil,nx=2318,b=0,s={1454,0.5949,0.3657}}, [2338]={n="Translating the Journal",l=37,r=8589934770,c=0,p={2318},g=nil,x=nil,nx=2339,b=0,s={1418,0.0242,0.4606}}, +[2339]={n="Find the Gems and Power Source",l=37,r=8589934770,c=0,p={2338},g=nil,x=nil,nx=2340,b=0,s={1418,0.0242,0.4606}}, +[2342]={n="Reclaimed Treasures",l=33,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1458,0.6232,0.4861}}, [2398]={n="The Lost Dwarves",l=35,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2240,b=2240,s={1455,0.7464,0.1174}}, +[2418]={n="Power Stones",l=30,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1418,0.4239,0.5293}}, [2500]={n="Badlands Reagent Run",l=36,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=17,b=0,s={1432,0.3707,0.4938}}, +[2768]={n="Divino-matic Rod",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1446,0.5246,0.2851}}, [2769]={n="The Brassbolts Brothers",l=40,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2770,b=2770,s={1455,0.6792,0.4610}}, +[2770]={n="Gahz'rilla",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1441,0.7814,0.7712}}, [2842]={n="Chief Engineer Scooty",l=20,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=2843,b=0,s={1454,0.7549,0.2536}}, +[2843]={n="Gnomer-gooooone!",l=20,r=8589934770,c=0,p={2842},g=nil,x=nil,nx=0,b=0,s={1434,0.2760,0.7748}}, +[2846]={n="Tiara of the Deep",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1445,0.4606,0.5709}}, [2861]={n="Tabetha's Task",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=2846,b=2846,s={1458,0.8514,0.1003,1455,0.2725,0.0830,1453,0.4956,0.8580,1454,0.3845,0.8613}}, [2864]={n="Tran'rek",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=2865,b=2865,s={1434,0.2695,0.7721}}, +[2865]={n="Scarab Shells",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1446,0.5157,0.2676}}, +[2922]={n="Save Techbot's Brain!",l=20,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1455,0.6955,0.5033}}, [2923]={n="Tinkmaster Overspark",l=20,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2922,b=2922,s={1453,0.5105,0.4839}}, +[2924]={n="Essential Artificials",l=24,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1455,0.6792,0.4610}}, [2925]={n="Klockmort's Essentials",l=24,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2924,b=2924,s={1457,0.5951,0.4538}}, +[2926]={n="Gnogaine",l=20,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2962,b=0,s={1426,0.4589,0.4939}}, [2927]={n="The Day After",l=20,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2926,b=2926,s={1455,0.6918,0.5055}}, +[2928]={n="Gyrodrillmatic Excavationators",l=20,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.6263,0.3411}}, +[2929]={n="The Grand Betrayal",l=25,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1455,0.6875,0.4897}}, +[2930]={n="Data Rescue",l=25,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1455,0.6983,0.4810}}, [2931]={n="Castpipe's Task",l=25,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2930,b=2930,s={1442,0.5952,0.6715}}, [2933]={n="Venom Bottles",l=40,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=2934,b=0,s={1425,0.2354,0.5880}}, [2934]={n="Undamaged Venom Sac",l=40,r=8589934770,c=0,p={2933},g=nil,x=nil,nx=2935,b=0,s={1424,0.6144,0.1906}}, [2935]={n="Consult Master Gadrin",l=40,r=8589934770,c=0,p={2934},g=nil,x=nil,nx=2936,b=0,s={1424,0.6144,0.1906}}, +[2936]={n="The Spider God",l=40,r=8589934770,c=0,p={2935},g=nil,x=nil,nx=2937,b=0,s={1411,0.5595,0.7472}}, +[2962]={n="The Only Cure is More Green Glow",l=20,r=4294967373,c=0,p={2926},g=nil,x=nil,nx=0,b=0,s={1426,0.4589,0.4939}}, [2988]={n="Witherbark Cages",l=40,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=2989,b=0,s={1425,0.0975,0.4447}}, [2989]={n="The Altar of Zul",l=40,r=4294967373,c=0,p={2988},g=nil,x=nil,nx=2990,b=0,s={1425,0.0975,0.4447}}, [2990]={n="Thadius Grimshade",l=40,r=4294967373,c=0,p={2989},g=nil,x=nil,nx=2991,b=0,s={1425,0.0975,0.4447}}, +[2991]={n="Nekrum's Medallion",l=40,r=4294967373,c=0,p={2990},g=nil,x=nil,nx=2992,b=0,s={1419,0.6690,0.1947}}, +[3042]={n="Troll Temper",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1446,0.5141,0.2875}}, +[3341]={n="Bring the End",l=37,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1458,0.7405,0.3331}}, [3380]={n="The Sunken Temple",l=46,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=3444,b=0,s={1444,0.7442,0.4336}}, [3441]={n="Divine Retribution",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=3442,b=0,s={1427,0.3906,0.3899}}, [3442]={n="The Flawless Flame",l=40,r=0,c=0,p={3441},g=nil,x=nil,nx=3443,b=0,s={1427,0.3906,0.3899}}, [3443]={n="Forging the Shaft",l=40,r=0,c=0,p={3442},g=nil,x=nil,nx=3452,b=0,s={1427,0.3906,0.3899}}, [3444]={n="The Stone Circle",l=46,r=0,c=0,p={3380,3445},g=nil,x=nil,nx=0,b=0,s={1446,0.5271,0.4592}}, [3445]={n="The Sunken Temple",l=46,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=3444,b=0,s={1444,0.3183,0.4561}}, +[3446]={n="Into the Depths",l=46,r=0,c=0,p={3444},g=nil,x=nil,nx=0,b=0,s={1446,0.5271,0.4592}}, +[3447]={n="Secret of the Circle",l=46,r=0,c=0,p={3444},g=nil,x=nil,nx=0,b=0,s={1446,0.5271,0.4592}}, [3452]={n="The Flame's Casing",l=40,r=0,c=0,p={3443},g=nil,x=nil,nx=3453,b=0,s={1427,0.3906,0.3899}}, [3453]={n="The Torch of Retribution",l=40,r=0,c=0,p={3452},g=nil,x=nil,nx=3454,b=0,s={1427,0.3906,0.3899}}, [3454]={n="The Torch of Retribution",l=40,r=0,c=0,p={3453},g=nil,x=nil,nx=3462,b=0,s={1427,0.3906,0.3899}}, @@ -94,24 +161,40 @@ ns.pinQuests = { [3520]={n="Screecher Spirits",l=40,r=0,c=0,p=nil,g=nil,x=nil,nx=3527,b=0,s={1446,0.6699,0.2236}}, [3527]={n="The Prophecy of Mosh'aru",l=40,r=0,c=0,p={3520},g=nil,x=nil,nx=4787,b=0,s={1446,0.6699,0.2236}}, [3528]={n="The God Hakkar",l=40,r=0,c=0,p={4787},g=nil,x=nil,nx=5065,b=0,s={1446,0.6699,0.2236}}, +[3636]={n="Bring the Light",l=39,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.5031,0.4547}}, [3701]={n="The Smoldering Ruins of Thaurissan",l=50,r=4294967373,c=0,p={3702},g=nil,x=nil,nx=4341,b=0,s={1455,0.3837,0.5531}}, [3702]={n="The Smoldering Ruins of Thaurissan",l=50,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=3701,b=0,s={1455,0.3837,0.5531}}, [3765]={n="The Corruption Abroad",l=18,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=1275,b=1275,s={1453,0.3624,0.6761}}, [3801]={n="Dark Iron Legacy",l=48,r=0,c=0,p=nil,g=nil,x=nil,nx=3802,b=0,s={1428,0.2896,0.2893}}, +[3802]={n="Dark Iron Legacy",l=48,r=0,c=0,p={3801},g=nil,x=nil,nx=0,b=0,s={1428,0.2896,0.2893}}, [3906]={n="Disharmony of Flame",l=48,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=3907,b=0,s={1418,0.0333,0.4826}}, +[3907]={n="Disharmony of Fire",l=48,r=8589934770,c=0,p={3906},g=nil,x=nil,nx=0,b=0,s={1418,0.0333,0.4826}}, [3981]={n="Commander Gor'shak",l=48,r=8589934770,c=0,p={3906},g=nil,x=nil,nx=3982,b=0,s={1418,0.0596,0.4773}}, [4002]={n="The Eastern Kingdom",l=48,r=8589934770,c=0,p={4001},g=nil,x=nil,nx=4003,b=0,s={1454,0.3173,0.3782}}, +[4003]={n="The Royal Rescue",l=48,r=8589934770,c=0,p={4002},g=nil,x=nil,nx=4004,b=0,s={1454,0.3173,0.3782}}, [4022]={n="A Taste of Flame",l=52,r=0,c=0,p={3481},g=nil,x={4023},nx=4024,b=0,s={1428,0.9509,0.3156}}, +[4024]={n="A Taste of Flame",l=52,r=0,c=0,p={4022,4023},g=nil,x=nil,nx=0,b=0,s={1428,0.9509,0.3156}}, [4061]={n="The Rise of the Machines",l=52,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=4062,b=0,s={1418,0.0302,0.4781}}, [4062]={n="The Rise of the Machines",l=52,r=8589934770,c=0,p={4061},g=nil,x=nil,nx=4063,b=0,s={1418,0.0302,0.4781}}, +[4063]={n="The Rise of the Machines",l=52,r=8589934770,c=0,p={4062},g=nil,x=nil,nx=0,b=0,s={1418,0.2595,0.4487}}, +[4081]={n="KILL ON SIGHT: Dark Iron Dwarves",l=48,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=4082,b=0,s={1418,0.0374,0.4743}}, +[4082]={n="KILL ON SIGHT: High Ranking Dark Iron Officials",l=50,r=8589934770,c=0,p={4081},g=nil,x=nil,nx=4122,b=0,s={1418,0.0394,0.4673}}, +[4121]={n="Precarious Predicament",l=52,r=8589934770,c=0,p={4122},g=nil,x=nil,nx=4132,b=0,s={1428,0.4020,0.3424}}, [4122]={n="Grark Lorkrub",l=52,r=8589934770,c=0,p={4082},g=nil,x=nil,nx=4121,b=0,s={1418,0.0588,0.4763}}, +[4123]={n="The Heart of the Mountain",l=50,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1428,0.6515,0.2391}}, +[4126]={n="Hurley Blackbreath",l=50,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1426,0.4683,0.5236}}, [4128]={n="Ragnar Thunderbrew",l=50,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=4126,b=4126,s={1419,0.6363,0.2063}}, +[4132]={n="Operation: Death to Angerforge",l=52,r=8589934770,c=0,p={4121},g=nil,x=nil,nx=0,b=0,s={1418,0.0581,0.4752}}, [4133]={n="Vivian Lagrave",l=50,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=4134,b=4134,s={1458,0.5014,0.6797}}, +[4134]={n="Lost Thunderbrew Recipe",l=50,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1418,0.0290,0.4776}}, +[4136]={n="Ribbly Screwspigot",l=48,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1428,0.6606,0.2195}}, [4141]={n="Muigin and Larion",l=47,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=4142,b=0,s={1449,0.4294,0.0964}}, [4142]={n="A Visit to Gregan",l=47,r=4294967373,c=0,p={4141},g=nil,x=nil,nx=4143,b=0,s={1449,0.4294,0.0964}}, +[4143]={n="Haze of Evil",l=47,r=4294967373,c=0,p={4142},g=nil,x=nil,nx=4144,b=0,s={1444,0.4512,0.2557}}, [4145]={n="Larion and Muigin",l=47,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=4147,b=0,s={1449,0.4554,0.0872}}, [4146]={n="Zapper Fuel",l=47,r=8589934770,c=0,p={4147},g=nil,x=nil,nx=4148,b=0,s={1413,0.6245,0.3873}}, [4147]={n="Marvon's Workshop",l=47,r=8589934770,c=0,p={4145},g=nil,x=nil,nx=4146,b=0,s={1449,0.4554,0.0872}}, +[4148]={n="Bloodpetal Zapper",l=47,r=8589934770,c=0,p={4146},g=nil,x=nil,nx=0,b=0,s={1449,0.4554,0.0872}}, [4182]={n="Dragonkin Menace",l=48,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=4183,b=0,s={1428,0.8582,0.6895}}, [4183]={n="The True Masters",l=48,r=4294967373,c=0,p={4182},g=nil,x=nil,nx=4184,b=0,s={1428,0.8582,0.6895}}, [4184]={n="The True Masters",l=48,r=4294967373,c=0,p={4183},g=nil,x=nil,nx=4185,b=0,s={1433,0.2490,0.4445}}, @@ -121,105 +204,178 @@ ns.pinQuests = { [4224]={n="The True Masters",l=48,r=4294967373,c=0,p={4223},g=nil,x=nil,nx=4241,b=0,s={1428,0.8474,0.6902}}, [4241]={n="Marshal Windsor",l=48,r=4294967373,c=0,p={4224},g=nil,x=nil,nx=4242,b=0,s={1428,0.8474,0.6902}}, [4262]={n="Overmaster Pyron",l=48,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=4263,b=0,s={1428,0.8541,0.7006}}, +[4263]={n="Incendius!",l=48,r=4294967373,c=0,p={4262},g=nil,x=nil,nx=0,b=0,s={1428,0.8541,0.7006}}, +[4286]={n="The Good Stuff",l=50,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1428,0.8456,0.6868}}, [4324]={n="Yuka Screwspigot",l=48,r=0,c=0,p=nil,g=nil,x=nil,nx=4136,b=4136,s={1446,0.6704,0.2401}}, [4341]={n="Kharan Mighthammer",l=50,r=4294967373,c=0,p={3701},g=nil,x=nil,nx=4342,b=0,s={1455,0.3909,0.5620}}, +[4362]={n="The Fate of the Kingdom",l=50,r=4294967373,c=0,p={4361},g=nil,x=nil,nx=4363,b=0,s={1455,0.3909,0.5620}}, +[4701]={n="Put Her Down",l=55,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1428,0.8582,0.6895}}, +[4724]={n="The Pack Mistress",l=55,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1418,0.0596,0.4773}}, [4726]={n="Broodling Essence",l=50,r=0,c=0,p=nil,g=nil,x=nil,nx=4808,b=0,s={1428,0.6524,0.2400}}, +[4729]={n="Kibler's Exotic Pets",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1428,0.6589,0.2192}}, [4734]={n="Egg Freezing",l=57,r=0,c=0,p={4810},g=nil,x=nil,nx=4735,b=0,s={1428,0.6524,0.2400}}, [4735]={n="Egg Collection",l=57,r=0,c=0,p={4734},g=nil,x=nil,nx=5522,b=0,s={1428,0.6524,0.2400}}, +[4764]={n="Doomrigger's Clasp",l=57,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=4765,b=0,s={1428,0.8484,0.6912}}, [4766]={n="Mayara Brightwing",l=57,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=4764,b=4764,s={1453,0.7694,0.4783}}, +[4768]={n="The Darkstone Tablet",l=57,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1418,0.0290,0.4776}}, [4769]={n="Vivian Lagrave and the Darkstone Tablet",l=57,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=4768,b=4768,s={1458,0.5014,0.6797}}, +[4771]={n="Dawn's Gambit",l=57,r=0,c=0,p={5531},g=nil,x=nil,nx=0,b=0,s={1423,0.7166,0.4994}}, [4787]={n="The Ancient Egg",l=40,r=0,c=0,p={3527},g=nil,x=nil,nx=3528,b=0,s={1446,0.6699,0.2236}}, +[4788]={n="The Final Tablets",l=40,r=0,c=0,p={5065},g=nil,x=nil,nx=8181,b=0,s={1446,0.6689,0.2403}}, [4808]={n="Felnok Steelspring",l=50,r=0,c=0,p={4726},g=nil,x=nil,nx=4809,b=0,s={1428,0.6524,0.2400}}, [4809]={n="Chillwind Horns",l=50,r=0,c=0,p={4808},g=nil,x=nil,nx=4810,b=0,s={1452,0.6163,0.3861}}, [4810]={n="Return to Tinkee",l=50,r=0,c=0,p={4809},g=nil,x=nil,nx=4907,b=0,s={1452,0.6163,0.3861}}, +[4862]={n="En-Ay-Es-Tee-Why",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1428,0.6589,0.2192}}, +[4866]={n="Mother's Milk",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1428,0.6501,0.2376}}, +[4903]={n="Warlord's Command",l=55,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=4941,b=0,s={1418,0.0581,0.4752}}, [4907]={n="Tinkee Steamboil",l=57,r=0,c=0,p={4810},g=nil,x=nil,nx=4734,b=4734,s={1452,0.6163,0.3861}}, [4941]={n="Eitrigg's Wisdom",l=55,r=8589934770,c=0,p={4903},g=nil,x=nil,nx=4974,b=0,s={1418,0.0581,0.4752}}, +[4974]={n="For The Horde!",l=55,r=8589934770,c=0,p={4941},g=nil,x=nil,nx=6566,b=0,s={1454,0.3173,0.3782}}, [4981]={n="Operative Bijou",l=55,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=4982,b=0,s={1418,0.0588,0.4763}}, [5065]={n="The Lost Tablets of Mosh'aru",l=40,r=0,c=0,p={3528},g=nil,x=nil,nx=4788,b=0,s={1446,0.6689,0.2403}}, +[5081]={n="Maxwell's Mission",l=55,r=4294967373,c=0,p={5002},g=nil,x=nil,nx=0,b=0,s={1428,0.8474,0.6902}}, +[5102]={n="General Drakkisath's Demise",l=55,r=4294967373,c=0,p={5089},g=nil,x=nil,nx=0,b=0,s={1428,0.8474,0.6902}}, +[5212]={n="The Flesh Does Not Lie",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=5213,b=0,s={1423,0.7166,0.4994}}, +[5213]={n="The Active Agent",l=55,r=0,c=0,p={5212},g=nil,x=nil,nx=0,b=0,s={1423,0.7166,0.4994}}, +[5214]={n="The Great Ezra Grimm",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1423,0.7088,0.4843}}, +[5243]={n="Houses of the Holy",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1423,0.7189,0.4829}}, +[5251]={n="The Archivist",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=5262,b=0,s={1423,0.7163,0.5009}}, +[5263]={n="Above and Beyond",l=55,r=0,c=0,p={5262},g=nil,x=nil,nx=5264,b=0,s={1423,0.7163,0.5009}}, [5281]={n="The Restless Souls",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=5282,b=0,s={1423,0.6993,0.5372}}, +[5282]={n="The Restless Souls",l=55,r=0,c=0,p={5281},g=nil,x=nil,nx=0,b=0,s={1423,0.1136,0.2660}}, +[5341]={n="Barov Family Fortune",l=52,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=5342,b=0,s={1420,0.8306,0.7160}}, +[5343]={n="Barov Family Fortune",l=52,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=5344,b=0,s={1422,0.4345,0.8373}}, [5382]={n="Doctor Theolen Krastinov, the Butcher",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=5515,b=0,s={1422,0.7022,0.7371}}, [5384]={n="Kirtonos the Herald",l=55,r=0,c=0,p={5515},g=nil,x=nil,nx=5461,b=0,s={1422,0.7022,0.7371}}, [5461]={n="The Human, Ras Frostwhisper",l=57,r=0,c=0,p={5384},g=nil,x=nil,nx=5462,b=0,s={1422,0.7057,0.7411}}, [5462]={n="The Dying, Ras Frostwhisper",l=57,r=0,c=0,p={5461},g=nil,x=nil,nx=5463,b=0,s={1422,0.7057,0.7411}}, [5463]={n="Menethil's Gift",l=57,r=0,c=0,p={5462},g=nil,x=nil,nx=5464,b=0,s={1423,0.7189,0.4829}}, [5465]={n="Soulbound Keepsake",l=57,r=0,c=0,p={5464},g=nil,x=nil,nx=5466,b=0,s={1423,0.7189,0.4829}}, +[5466]={n="The Lich, Ras Frostwhisper",l=57,r=0,c=0,p={5465},g=nil,x=nil,nx=0,b=0,s={1422,0.7057,0.7411}}, [5515]={n="Krastinov's Bag of Horrors",l=55,r=0,c=0,p={5382},g=nil,x=nil,nx=5384,b=0,s={1422,0.7022,0.7371}}, [5522]={n="Leonid Barthalomew",l=57,r=0,c=0,p={4735},g=nil,x=nil,nx=5531,b=0,s={1428,0.6524,0.2400}}, +[5526]={n="Shards of the Felvine",l=56,r=0,c=0,p={5527},g=nil,x=nil,nx=0,b=0,s={1450,0.5169,0.4510}}, [5527]={n="A Reliquary of Purity",l=56,r=0,c=0,p=nil,g=nil,x=nil,nx=5526,b=0,s={1450,0.5169,0.4510}}, +[5529]={n="Plagued Hatchlings",l=55,r=0,c=0,p=nil,g=nil,x=nil,nx=5582,b=0,s={1423,0.7166,0.4994}}, [5531]={n="Betina Bigglezink",l=57,r=0,c=0,p={5522},g=nil,x=nil,nx=4771,b=0,s={1423,0.7189,0.4829}}, [5542]={n="Demon Dogs",l=52,r=0,c=0,p=nil,g=nil,x=nil,nx=5742,b=0,s={1423,0.0516,0.3557,1422,0.5395,0.2445}}, [5543]={n="Blood Tinged Skies",l=52,r=0,c=0,p=nil,g=nil,x=nil,nx=5742,b=0,s={1423,0.0516,0.3557,1422,0.5395,0.2445}}, [5544]={n="Carrion Grubbage",l=52,r=0,c=0,p=nil,g=nil,x=nil,nx=5742,b=0,s={1423,0.0516,0.3557,1422,0.5395,0.2445}}, +[5723]={n="Testing an Enemy's Strength",l=9,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1456,0.7014,0.2952}}, +[5725]={n="The Power to Destroy...",l=9,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1458,0.5625,0.9220}}, [5726]={n="Hidden Enemies",l=9,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=5727,b=0,s={1454,0.3173,0.3782}}, [5727]={n="Hidden Enemies",l=9,r=8589934770,c=0,p={5726},g=nil,x=nil,nx=5728,b=0,s={1454,0.3173,0.3782}}, +[5728]={n="Hidden Enemies",l=9,r=8589934770,c=0,p={5727},g=nil,x=nil,nx=5729,b=0,s={1454,0.3173,0.3782}}, [5742]={n="Redemption",l=52,r=0,c=0,p=nil,g={5542,5543,5544},x=nil,nx=5781,b=0,s={1423,0.0516,0.3557}}, +[5761]={n="Slaying the Beast",l=9,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1454,0.4947,0.5059}}, [5781]={n="Of Forgotten Memories",l=52,r=0,c=0,p={5742},g=nil,x=nil,nx=5845,b=0,s={1423,0.0516,0.3557}}, [5845]={n="Of Lost Honor",l=52,r=0,c=0,p={5781},g=nil,x=nil,nx=5846,b=0,s={1423,0.0516,0.3557}}, [5846]={n="Of Love and Family",l=52,r=0,c=0,p={5845},g=nil,x=nil,nx=5848,b=0,s={1423,0.0516,0.3557}}, +[5848]={n="Of Love and Family",l=52,r=0,c=0,p={5846},g=nil,x=nil,nx=5861,b=0,s={1422,0.6577,0.7537}}, [6022]={n="To Kill With Purpose",l=54,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1423,0.2223,0.6351}}, [6042]={n="Un-Life's Little Annoyances",l=54,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1423,0.2223,0.6351}}, [6133]={n="The Ranger Lord's Behest",l=54,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1423,0.2223,0.6351}}, [6135]={n="Duskwing, Oh How I Hate Thee...",l=56,r=8589934770,c=0,p=nil,g={6022,6042,6133},x=nil,nx=0,b=0,s={1423,0.2223,0.6351}}, [6136]={n="The Corpulent One",l=56,r=8589934770,c=0,p=nil,g={6022,6042,6133},x=nil,nx=0,b=0,s={1423,0.2223,0.6351}}, [6141]={n="Brother Anton",l=34,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=261,b=261,s={1453,0.5262,0.4318}}, +[6163]={n="Ramstein",l=56,r=8589934770,c=0,p=nil,g={6135,6136},x=nil,nx=0,b=0,s={1423,0.2223,0.6351}}, [6402]={n="Stormwind Rendezvous",l=50,r=4294967373,c=0,p={4322},g=nil,x=nil,nx=6403,b=0,s={1428,0.8474,0.6902}}, [6403]={n="The Great Masquerade",l=50,r=4294967373,c=0,p={6402},g=nil,x=nil,nx=6501,b=0,s={1453,0.7361,0.9105}}, [6501]={n="The Dragon's Eye",l=50,r=4294967373,c=0,p={6403},g=nil,x=nil,nx=6502,b=0,s={1453,0.8021,0.3835}}, +[6502]={n="Drakefire Amulet",l=50,r=4294967373,c=0,p={6501},g=nil,x=nil,nx=0,b=0,s={1452,0.5455,0.5120}}, +[6521]={n="An Unholy Alliance",l=28,r=8589934770,c=0,p={6522},g=nil,x=nil,nx=0,b=0,s={1458,0.5625,0.9220}}, [6562]={n="Trouble in the Deeps",l=17,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=6563,b=6563,s={1442,0.4736,0.6425}}, +[6563]={n="The Essence of Aku'Mai",l=17,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1440,0.1156,0.3429}}, +[6565]={n="Allegiance to the Old Gods",l=17,r=8589934770,c=0,p={6564},g=nil,x=nil,nx=0,b=0,s={1440,0.1156,0.3429}}, [6566]={n="What the Wind Carries",l=55,r=8589934770,c=0,p={4974},g=nil,x=nil,nx=6567,b=0,s={1454,0.3173,0.3782}}, [6567]={n="The Champion of the Horde",l=55,r=8589934770,c=0,p={6566},g=nil,x=nil,nx=6568,b=0,s={1454,0.3173,0.3782}}, [6568]={n="The Testament of Rexxar",l=55,r=8589934770,c=0,p={6567},g=nil,x=nil,nx=6569,b=0,s={1443,0.5400,0.0200}}, +[6569]={n="Oculus Illusions",l=55,r=8589934770,c=0,p={6568},g=nil,x=nil,nx=6570,b=0,s={1422,0.5079,0.7785}}, [6570]={n="Emberstrife",l=55,r=8589934770,c=0,p={6569},g=nil,x=nil,nx=0,b=0,s={1422,0.5079,0.7785}}, [6582]={n="The Test of Skulls, Scryer",l=55,r=8589934770,c=0,p={6570},g=nil,x=nil,nx=0,b=0,s={1445,0.5666,0.8772}}, [6583]={n="The Test of Skulls, Somnus",l=55,r=8589934770,c=0,p={6570},g=nil,x=nil,nx=0,b=0,s={1445,0.5666,0.8772}}, [6584]={n="The Test of Skulls, Chronalis",l=55,r=8589934770,c=0,p={6570},g=nil,x=nil,nx=0,b=0,s={1445,0.5666,0.8772}}, [6585]={n="The Test of Skulls, Axtroz",l=55,r=8589934770,c=0,p=nil,g={6582,6583,6584},x=nil,nx=6601,b=0,s={1445,0.5666,0.8772}}, [6601]={n="Ascension...",l=55,r=8589934770,c=0,p={6585},g=nil,x=nil,nx=6602,b=0,s={1445,0.5666,0.8772}}, +[6602]={n="Blood of the Black Dragon Champion",l=55,r=8589934770,c=0,p={6601},g=nil,x=nil,nx=0,b=0,s={1443,0.5400,0.0200}}, +[6626]={n="A Host of Evil",l=28,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1413,0.4901,0.9494}}, [6627]={n="Test of Lore",l=25,r=8589934770,c=0,p={1154},g=nil,x=nil,nx=1159,b=0,s={1442,0.7880,0.4569}}, +[6921]={n="Amongst the Ruins",l=21,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1440,0.1156,0.3429}}, +[7028]={n="Twisted Evils",l=41,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1443,0.6220,0.3963}}, +[7029]={n="Vyletongue Corruption",l=41,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1443,0.2322,0.7033}}, +[7041]={n="Vyletongue Corruption",l=41,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1443,0.6850,0.0888}}, +[7044]={n="Legends of Maraudon",l=41,r=0,c=0,p=nil,g=nil,x=nil,nx=7046,b=0,s={1443,0.3190,0.6380}}, +[7064]={n="Corruption of Earth and Seed",l=45,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1443,0.2687,0.7767}}, +[7065]={n="Corruption of Earth and Seed",l=45,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1443,0.6383,0.1067}}, +[7067]={n="The Pariah's Instructions",l=39,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1443,0.5042,0.8665}}, +[7068]={n="Shadowshard Fragments",l=39,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1454,0.3916,0.8627}}, +[7070]={n="Shadowshard Fragments",l=39,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1445,0.6642,0.4926}}, +[7201]={n="The Last Element",l=48,r=8589934770,c=0,p={3906},g=nil,x=nil,nx=0,b=0,s={1418,0.0290,0.4776}}, +[7441]={n="Pusillin and the Elder Azj'Tordin",l=54,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1444,0.7691,0.3735}}, +[7481]={n="Elven Legends",l=54,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1444,0.7440,0.4400}}, +[7482]={n="Elven Legends",l=54,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1444,0.3165,0.4345}}, +[7488]={n="Lethtendris's Web",l=54,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1444,0.3038,0.4617}}, +[7489]={n="Lethtendris's Web",l=54,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1444,0.7618,0.4383}}, [7492]={n="Camp Mojache",l=54,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=7489,b=7489,s={1458,0.6390,0.4408,1454,0.3768,0.7516,1456,0.4433,0.5876}}, [7494]={n="Feathermoon Stronghold",l=54,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=7488,b=7488,s={1453,0.5639,0.7409,1455,0.5592,0.8139,1457,0.4781,0.8197}}, [7562]={n="Mor'zul Bloodbringer",l=60,r=0,c=256,p=nil,g=nil,x=nil,nx=7563,b=7563,s={1453,0.3953,0.8453,1454,0.4752,0.4672,1455,0.5270,0.0608,1435,0.4858,0.5527}}, [7563]={n="Rage of Blood",l=60,r=0,c=256,p=nil,g=nil,x=nil,nx=7564,b=0,s={1428,0.1269,0.3164}}, [7564]={n="Wildeyes",l=60,r=0,c=256,p={7563},g=nil,x=nil,nx=0,b=0,s={1428,0.1269,0.3164}}, +[7581]={n="The Prison's Bindings",l=60,r=0,c=256,p=nil,g=nil,x=nil,nx=7583,b=0,s={1419,0.3413,0.5014}}, [7623]={n="Lord Banehollow",l=60,r=0,c=256,p=nil,g=nil,x=nil,nx=7624,b=0,s={1428,0.1244,0.3163}}, [7624]={n="Ulathek the Traitor",l=60,r=0,c=256,p={7623},g=nil,x=nil,nx=7625,b=0,s={1448,0.3593,0.4442}}, [7625]={n="Xorothian Stardust",l=60,r=0,c=256,p={7624},g=nil,x=nil,nx=0,b=0,s={1448,0.3593,0.4442}}, [7626]={n="Bell of Dethmoora",l=60,r=0,c=256,p={7564},g=nil,x=nil,nx=0,b=0,s={1428,0.1269,0.3164}}, [7627]={n="Wheel of the Black March",l=60,r=0,c=256,p={7564},g=nil,x=nil,nx=0,b=0,s={1428,0.1269,0.3164}}, [7628]={n="Doomsday Candle",l=60,r=0,c=256,p={7564},g=nil,x=nil,nx=0,b=0,s={1428,0.1269,0.3164}}, +[7629]={n="Imp Delivery",l=60,r=0,c=256,p={7625},g=nil,x=nil,nx=0,b=0,s={1428,0.1244,0.3163}}, [7630]={n="Arcanite",l=60,r=0,c=256,p=nil,g={7626,7627,7628},x=nil,nx=0,b=0,s={1428,0.1244,0.3163}}, +[7631]={n="Dreadsteed of Xoroth",l=60,r=0,c=256,p=nil,g={7629,7630},x=nil,nx=0,b=0,s={1428,0.1269,0.3164}}, [7637]={n="Emphasis on Sacrifice",l=60,r=5,c=2,p={7638},g=nil,x=nil,nx=7639,b=0,s={1453,0.4843,0.5022}}, [7638]={n="Lord Grayson Shadowbreaker",l=60,r=5,c=2,p=nil,g=nil,x=nil,nx=0,b=0,s={1453,0.5048,0.4749}}, [7639]={n="To Show Due Judgment",l=60,r=5,c=2,p={7637},g=nil,x=nil,nx=7640,b=0,s={1455,0.2473,0.0816}}, [7640]={n="Exorcising Terrordale",l=60,r=5,c=2,p={7639},g=nil,x=nil,nx=0,b=0,s={1453,0.4843,0.5022}}, [7641]={n="The Work of Grimand Elmore",l=60,r=5,c=2,p={7640},g=nil,x=nil,nx=7642,b=0,s={1453,0.4843,0.5022}}, +[7642]={n="Collection of Goods",l=60,r=5,c=2,p={7641},g=nil,x=nil,nx=0,b=0,s={1453,0.5973,0.3378}}, +[7643]={n="Ancient Equine Spirit",l=60,r=5,c=2,p={7642},g=nil,x=nil,nx=7644,b=0,s={1453,0.4843,0.5022}}, [7646]={n="The Divination Scryer",l=60,r=5,c=2,p={7644},g=nil,x=nil,nx=7647,b=0,s={1453,0.4843,0.5022}}, +[7647]={n="Judgment and Redemption",l=60,r=5,c=2,p={7646},g=nil,x=nil,nx=0,b=0,s={1453,0.4843,0.5022}}, [7667]={n="Material Assistance",l=58,r=8589934770,c=64,p=nil,g=nil,x=nil,nx=8258,b=0,s={1454,0.3866,0.3592}}, +[7668]={n="The Darkreaver Menace",l=58,r=8589934770,c=64,p={7667},g=nil,x={8258},nx=0,b=0,s={1454,0.3866,0.3592}}, [7670]={n="Lord Grayson Shadowbreaker",l=60,r=4294967373,c=2,p=nil,g=nil,x={7638},nx=7637,b=0,s={1455,0.2313,0.0614}}, [7722]={n="What the Flux?",l=45,r=0,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1427,0.3880,0.2851}}, [8151]={n="The Hunter's Charm",l=50,r=0,c=4,p=nil,g=nil,x=nil,nx=8153,b=0,s={1456,0.5730,0.8979,1454,0.6605,0.1853,1457,0.4221,0.0727,1455,0.7089,0.8361,1453,0.6759,0.3578}}, [8153]={n="Courser Antlers",l=50,r=0,c=4,p={8151},g=nil,x=nil,nx=8231,b=0,s={1447,0.4240,0.4262}}, [8231]={n="Wavethrashing",l=50,r=0,c=4,p={8153},g=nil,x=nil,nx=8232,b=0,s={1447,0.4240,0.4262}}, +[8232]={n="The Green Drake",l=50,r=0,c=4,p={8231},g=nil,x=nil,nx=0,b=0,s={1447,0.4240,0.4262}}, [8233]={n="A Simple Request",l=50,r=0,c=8,p=nil,g=nil,x=nil,nx=8234,b=8234,s={1453,0.7743,0.6531,1454,0.4390,0.5463,1457,0.3699,0.2191,1458,0.8521,0.7157,1455,0.5196,0.1484,1455,0.5150,0.1533}}, [8234]={n="Sealed Azure Bag",l=50,r=0,c=8,p=nil,g=nil,x=nil,nx=8235,b=0,s={1416,0.8602,0.7888}}, [8235]={n="Encoded Fragments",l=50,r=0,c=8,p={8234},g=nil,x=nil,nx=8236,b=0,s={1447,0.2925,0.4021}}, +[8236]={n="The Azure Key",l=50,r=0,c=8,p={8235},g=nil,x=nil,nx=0,b=0,s={1447,0.2925,0.4021}}, [8251]={n="Magic Dust",l=50,r=0,c=128,p=nil,g=nil,x=nil,nx=8252,b=0,s={1447,0.2925,0.4021}}, [8252]={n="The Siren's Coral",l=50,r=0,c=128,p={8251},g=nil,x=nil,nx=8253,b=0,s={1447,0.2925,0.4021}}, +[8253]={n="Destroy Morphaz",l=50,r=0,c=128,p={8252},g=nil,x=nil,nx=0,b=0,s={1447,0.2925,0.4021}}, [8254]={n="Cenarion Aid",l=50,r=0,c=16,p=nil,g=nil,x=nil,nx=8255,b=0,s={1456,0.2456,0.2257,1453,0.4950,0.4521,1454,0.3559,0.8782,1455,0.2473,0.0816}}, [8255]={n="Of Coursers We Know",l=50,r=0,c=16,p={8254},g=nil,x=nil,nx=8256,b=0,s={1447,0.4240,0.4262}}, [8256]={n="The Ichor of Undeath",l=50,r=0,c=16,p={8255},g=nil,x=nil,nx=8257,b=0,s={1447,0.4240,0.4262}}, +[8257]={n="Blood of Morphaz",l=50,r=0,c=16,p={8256},g=nil,x=nil,nx=0,b=0,s={1447,0.4240,0.4262}}, +[8258]={n="The Darkreaver Menace",l=60,r=8589934770,c=64,p={7667},g=nil,x={7668},nx=0,b=0,s={1454,0.3866,0.3592}}, [8410]={n="Elemental Mastery",l=50,r=8589934770,c=64,p=nil,g=nil,x={8411},nx=8412,b=0,s={1456,0.2199,0.1880,1454,0.3866,0.3592}}, [8411]={n="Mastering the Elements",l=50,r=8589934770,c=64,p=nil,g=nil,x={8410},nx=8412,b=0,s={1416,0.8050,0.6692}}, [8412]={n="Spirit Totem",l=50,r=8589934770,c=64,p={8410,8411},g=nil,x=nil,nx=8413,b=0,s={1416,0.8050,0.6692}}, +[8413]={n="Da Voodoo",l=50,r=8589934770,c=64,p={8412},g=nil,x=nil,nx=0,b=0,s={1416,0.8050,0.6692}}, [8414]={n="Dispelling Evil",l=50,r=5,c=2,p=nil,g=nil,x=nil,nx=8416,b=0,s={1422,0.4270,0.8403}}, [8415]={n="Chillwind Point",l=50,r=5,c=2,p=nil,g=nil,x=nil,nx=8414,b=8414,s={1453,0.4843,0.5022,1455,0.2313,0.0614}}, [8416]={n="Inert Scourgestones",l=50,r=5,c=2,p={8414},g=nil,x=nil,nx=8418,b=0,s={1422,0.5205,0.8327}}, [8417]={n="A Troubled Spirit",l=50,r=0,c=1,p=nil,g=nil,x=nil,nx=8423,b=8423,s={1456,0.5724,0.8737,1454,0.8039,0.3238,1458,0.4693,0.1523,1455,0.7034,0.9065,1453,0.8055,0.5987,1457,0.5894,0.3535}}, +[8418]={n="Forging the Mightstone",l=50,r=5,c=2,p={8416},g=nil,x=nil,nx=0,b=0,s={1422,0.4270,0.8403}}, [8419]={n="An Imp's Request",l=50,r=0,c=256,p=nil,g=nil,x={8420},nx=8421,b=0,s={1453,0.3924,0.8496,1454,0.4847,0.4543,1458,0.8621,0.1593,1455,0.5035,0.0566}}, [8420]={n="Hot and Itchy",l=50,r=0,c=256,p=nil,g=nil,x={8419},nx=8421,b=0,s={1448,0.4136,0.4502}}, [8421]={n="The Wrong Stuff",l=50,r=0,c=256,p={8419,8420},g=nil,x=nil,nx=8422,b=0,s={1448,0.4136,0.4502}}, +[8422]={n="Trolls of a Feather",l=50,r=0,c=256,p={8421},g=nil,x=nil,nx=0,b=0,s={1448,0.4136,0.4502}}, [8423]={n="Warrior Kinship",l=50,r=0,c=1,p=nil,g=nil,x=nil,nx=8424,b=0,s={1435,0.3429,0.6614}}, [8424]={n="War on the Shadowsworn",l=50,r=0,c=1,p={8423},g=nil,x=nil,nx=8425,b=0,s={1435,0.3429,0.6614}}, +[8425]={n="Voodoo Feathers",l=50,r=0,c=1,p={8424},g=nil,x=nil,nx=0,b=0,s={1435,0.3429,0.6614}}, [8905]={n="An Earnest Proposition",l=58,r=4294967373,c=1024,p=nil,g=nil,x=nil,nx=8922,b=0,s={1455,0.4353,0.5264}}, [8906]={n="An Earnest Proposition",l=58,r=4294967373,c=4,p=nil,g=nil,x=nil,nx=8922,b=0,s={1455,0.4353,0.5264}}, [8907]={n="An Earnest Proposition",l=58,r=4294967373,c=128,p=nil,g=nil,x=nil,nx=8922,b=0,s={1455,0.4353,0.5264}}, @@ -297,6 +453,22 @@ ns.pinQuests = { [8995]={n="Mea Culpa, Lord Valthalak",l=58,r=0,c=0,p={8994},g=nil,x=nil,nx=8996,b=0,s={1415,0.4890,0.6393}}, [8997]={n="Back to the Beginning",l=58,r=4294967373,c=0,p={8996},g=nil,x=nil,nx=0,b=0,s={1415,0.4890,0.6393}}, [8998]={n="Back to the Beginning",l=58,r=8589934770,c=0,p={8996},g=nil,x=nil,nx=0,b=0,s={1415,0.4890,0.6393}}, +[8999]={n="Saving the Best for Last",l=58,r=4294967373,c=1024,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9000]={n="Saving the Best for Last",l=58,r=4294967373,c=4,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9001]={n="Saving the Best for Last",l=58,r=4294967373,c=128,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9002]={n="Saving the Best for Last",l=58,r=4294967373,c=2,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9003]={n="Saving the Best for Last",l=58,r=4294967373,c=16,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9004]={n="Saving the Best for Last",l=58,r=4294967373,c=8,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9005]={n="Saving the Best for Last",l=58,r=4294967373,c=256,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9006]={n="Saving the Best for Last",l=58,r=4294967373,c=1,p={8997},g=nil,x=nil,nx=0,b=0,s={1455,0.4353,0.5264}}, +[9007]={n="Saving the Best for Last",l=58,r=8589934770,c=1024,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, +[9008]={n="Saving the Best for Last",l=58,r=8589934770,c=4,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, +[9009]={n="Saving the Best for Last",l=58,r=8589934770,c=16,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, +[9010]={n="Saving the Best for Last",l=58,r=8589934770,c=8,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, +[9011]={n="Saving the Best for Last",l=58,r=8589934770,c=64,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, +[9012]={n="Saving the Best for Last",l=58,r=8589934770,c=256,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, +[9013]={n="Saving the Best for Last",l=58,r=8589934770,c=1,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, +[9014]={n="Saving the Best for Last",l=58,r=8589934770,c=128,p={8998},g=nil,x=nil,nx=0,b=0,s={1454,0.3495,0.3829}}, [9016]={n="Anthion's Parting Words",l=58,r=8589934770,c=1024,p={9015},g=nil,x=nil,nx=9032,b=0,s={1423,0.2611,0.1130}}, [9017]={n="Anthion's Parting Words",l=58,r=8589934770,c=4,p={9015},g=nil,x=nil,nx=9032,b=0,s={1423,0.2611,0.1130}}, [9018]={n="Anthion's Parting Words",l=58,r=8589934770,c=128,p={9015},g=nil,x=nil,nx=9032,b=0,s={1423,0.2611,0.1130}}, @@ -307,8 +479,13 @@ ns.pinQuests = { [9032]={n="Bodley's Unfortunate Fate",l=58,r=8589934770,c=0,p={8957,9016,9017,9018,9019,9020,9021,9022},g=nil,x=nil,nx=8961,b=0,s={1454,0.3495,0.3829}}, [9051]={n="Toxic Test",l=50,r=0,c=1024,p={9052},g=nil,x=nil,nx=9053,b=0,s={1449,0.7164,0.7596}}, [9052]={n="Bloodpetal Poison",l=50,r=0,c=1024,p=nil,g=nil,x=nil,nx=9051,b=0,s={1449,0.7164,0.7596}}, +[9053]={n="A Better Ingredient",l=50,r=0,c=1024,p={9051},g=nil,x=nil,nx=0,b=0,s={1449,0.7164,0.7596}}, [9063]={n="Torwa Pathfinder",l=50,r=0,c=1024,p=nil,g=nil,x=nil,nx=9052,b=9052,s={1456,0.7648,0.2722,1457,0.3537,0.0840,1453,0.3611,0.6439,1450,0.5253,0.4057}}, [9251]={n="Atiesh, the Befouled Greatstaff",l=60,r=0,c=1424,p={9250},g=nil,x=nil,nx=0,b=0,s={1446,0.6527,0.5003}}, +[9257]={n="Atiesh, Greatstaff of the Guardian",l=60,r=0,c=16,p={9251},g=nil,x={9269,9270,9271},nx=0,b=0,s={1446,0.6527,0.5003}}, +[9269]={n="Atiesh, Greatstaff of the Guardian",l=60,r=0,c=1024,p={9251},g=nil,x={9257,9270,9271},nx=0,b=0,s={1446,0.6527,0.5003}}, +[9270]={n="Atiesh, Greatstaff of the Guardian",l=60,r=0,c=128,p={9251},g=nil,x={9257,9269,9271},nx=0,b=0,s={1446,0.6527,0.5003}}, +[9271]={n="Atiesh, Greatstaff of the Guardian",l=60,r=0,c=256,p={9251},g=nil,x={9257,9269,9270},nx=0,b=0,s={1446,0.6527,0.5003}}, [92742]={n="Testing the Wells",l=9,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1436,0.5248,0.5297}}, [92744]={n="Murloc Gills",l=9,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1436,0.5248,0.5297}}, [92745]={n="The State of the Mines",l=9,r=4294967373,c=0,p=nil,g={92742,92744},x=nil,nx=92747,b=0,s={1436,0.5248,0.5297}}, @@ -318,4 +495,9 @@ ns.pinQuests = { [92750]={n="Detonation at a Distance",l=9,r=4294967373,c=0,p={92748},g=nil,x=nil,nx=92751,b=0,s={1453,0.6188,0.3056}}, [92751]={n="Detonation at a Distance",l=9,r=4294967373,c=0,p={92750},g=nil,x=nil,nx=0,b=0,s={1453,0.8028,0.7007}}, [92752]={n="Explosive Consultation",l=9,r=4294967373,c=0,p=nil,g={92749,92751},x=nil,nx=92753,b=0,s={1453,0.6188,0.3056}}, +[92753]={n="Destruction in Deadmines",l=9,r=4294967373,c=0,p={92752},g=nil,x=nil,nx=92819,b=0,s={1436,0.5248,0.5297}}, +[96773]={n="The Coldbringer's Eye",l=34,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1416,0.1588,0.7311}}, +[96776]={n="An'she's Radiance",l=43,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1412,0.3268,0.2416,1412,0.3269,0.2278,1412,0.3359,0.2323,1412,0.3372,0.2466,1412,0.3375,0.2403,1412,0.3405,0.2517}}, +[96800]={n="Past Due",l=30,r=4294967373,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1416,0.0975,0.6336}}, +[97196]={n="The Coldbringer's Eye",l=34,r=8589934770,c=0,p=nil,g=nil,x=nil,nx=0,b=0,s={1412,0.3380,0.2417,1412,0.3401,0.2503,1412,0.3408,0.2206,1412,0.3417,0.2351,1412,0.3440,0.2165,1412,0.3448,0.2291,1412,0.3450,0.2100}}, } diff --git a/DungeonPreQuest/tools/generate.lua b/DungeonPreQuest/tools/generate.lua index 1d3bb8f..0002659 100644 --- a/DungeonPreQuest/tools/generate.lua +++ b/DungeonPreQuest/tools/generate.lua @@ -57,8 +57,14 @@ local function available(r, factionMask, classBit) return true end --- result[quest][dungeon][factionBit] = class mask -local result = {} +-- result[quest][dungeon][factionBit] = class mask, for the dungeons a quest +-- leads to; own[...] the same for the dungeon a quest itself is done in. +local result, own = {}, {} +local function add(t, id, name, factionBit, classBit) + t[id] = t[id] or {} + t[id][name] = t[id][name] or {} + t[id][name][factionBit] = (t[id][name][factionBit] or 0) + classBit +end for _, faction in ipairs(FACTIONS) do for _, class in ipairs(CLASSES) do local classBit = data.classKeys[class] @@ -76,11 +82,8 @@ for _, faction in ipairs(FACTIONS) do local found = {} walk(id, { [id] = true }, found) found[dungeon[id] or false] = nil - for name in pairs(found) do - result[id] = result[id] or {} - result[id][name] = result[id][name] or {} - result[id][name][faction.bit] = (result[id][name][faction.bit] or 0) + classBit - end + for name in pairs(found) do add(result, id, name, faction.bit, classBit) end + if dungeon[id] then add(own, id, dungeon[id], faction.bit, classBit) end end end end @@ -95,36 +98,50 @@ for _, n in ipairs(data.allDungeons) do end nameIndex[UNNAMED] = 0 -local ids = {} -for id in pairs(result) do ids[#ids + 1] = id end -table.sort(ids) +local function sortedIds(...) + local seen, list = {}, {} + for _, t in ipairs({ ... }) do + for id in pairs(t) do + if not seen[id] then seen[id] = true; list[#list + 1] = id end + end + end + table.sort(list) + return list +end +local ids = sortedIds(result, own) local out = assert(io.open(arg[2], "w")) out:write("-- Generated from QuestieDB's Forever quest data. Do not edit.\n") -out:write("-- quests[id] = { dungeon, faction, classes, ... }; faction 1 Alliance, 2 Horde, 3 both; classes 0 = all; dungeon 0 = unnamed.\n") +out:write("-- quests[id] = { dungeon, faction, classes, ... } for the dungeons a quest leads to;\n") +out:write("-- dungeonQuests[id] the same for the dungeon a quest is done in.\n") +out:write("-- faction 1 Alliance, 2 Horde, 3 both; classes 0 = all; dungeon 0 = unnamed.\n") out:write("local _, ns = ...\n\nns.dungeons = {\n") for _, n in ipairs(names) do out:write(string.format(" %q,\n", n)) end -out:write("}\n\nns.quests = {\n") -for _, id in ipairs(ids) do - local parts = {} - local dungeonsHere = {} - for name in pairs(result[id]) do dungeonsHere[#dungeonsHere + 1] = name end - table.sort(dungeonsHere) - for _, name in ipairs(dungeonsHere) do - local byFaction = result[id][name] - local a, h = byFaction[1], byFaction[2] - local function emit(faction, mask) - parts[#parts + 1] = nameIndex[name] .. "," .. faction .. "," .. (mask == ALL_CLASSES and 0 or mask) - end - if a and a == h then - emit(3, a) - else - if a then emit(1, a) end - if h then emit(2, h) end +local function writeTable(label, t) + out:write("}\n\nns.", label, " = {\n") + for _, id in ipairs(sortedIds(t)) do + local parts = {} + local dungeonsHere = {} + for name in pairs(t[id]) do dungeonsHere[#dungeonsHere + 1] = name end + table.sort(dungeonsHere) + for _, name in ipairs(dungeonsHere) do + local byFaction = t[id][name] + local a, h = byFaction[1], byFaction[2] + local function emit(faction, mask) + parts[#parts + 1] = nameIndex[name] .. "," .. faction .. "," .. (mask == ALL_CLASSES and 0 or mask) + end + if a and a == h then + emit(3, a) + else + if a then emit(1, a) end + if h then emit(2, h) end + end end + out:write(" [", id, "]={", table.concat(parts, ","), "},\n") end - out:write(" [", id, "]={", table.concat(parts, ","), "},\n") end +writeTable("quests", result) +writeTable("dungeonQuests", own) out:write("}\n") out:close() @@ -156,7 +173,7 @@ local function show(id) end print(id, q[id] and q[id].name, table.concat(list, " | ")) end -for _, id in ipairs({ 65, 155, 166, 8928, 8916, 94501 }) do show(id) end +for _, id in ipairs({ 65, 155, 166, 2929, 8928, 8916, 94501 }) do show(id) end -- Quest giver locations and the rules for when each quest can be picked up. -- Quests whose requirements the addon can't check get no marker. diff --git a/QuestShoppingList/Data.lua b/QuestShoppingList/Data.lua index bb06860..19210d7 100644 --- a/QuestShoppingList/Data.lua +++ b/QuestShoppingList/Data.lua @@ -17,6 +17,7 @@ ns.itemIDs = { ["alliance gift collection"]=22262, ["alterac swiss"]=8932, ["amber voodoo feather"]=20606, + ["arbor tarantula specimen"]=213566, ["arcane crystal"]=12363, ["arcane shard"]=20085, ["arcanic systems manual"]=209847, @@ -86,6 +87,7 @@ ns.itemIDs = { ["breath of wind"]=7081, ["brightcloth pants"]=14104, ["brilliant chromatic scale"]=12607, + ["briny seafood stew"]=274971, ["bronze bar"]=2841, ["bronze battle axe"]=7958, ["bronze greatsword"]=7957, @@ -94,12 +96,12 @@ ns.itemIDs = { ["brownell's blue striped racer"]=19803, ["burning charm"]=4479, ["buzzard wing"]=3404, - ["carved centaur totem"]=254432, ["catseye elixir"]=10592, ["catseye ultra goggles"]=10501, ["cenarion herb bag"]=22251, ["chained essence of eranikus"]=10455, ["charred razormane wand"]=5092, + ["cherry grog"]=4600, ["chest of containment coffers"]=7247, ["chimaerok tenderloin"]=21024, ["chimeric vest"]=15075, @@ -111,6 +113,7 @@ ns.itemIDs = { ["coarse thread"]=2320, ["coarse weightstone"]=3240, ["coif of elements"]=16667, + ["cold iron ore"]=219401, ["cologne bottle"]=21833, ["colorful kilt"]=10048, ["comfortable leather hat"]=8174, @@ -352,6 +355,7 @@ ns.itemIDs = { ["dreadmist robe"]=16700, ["dreadmist sandals"]=16704, ["dreadmist wraps"]=16705, + ["dream-touched dragonscale"]=219402, ["dreamless sleep potion"]=12190, ["dusky bracers"]=7378, ["earthen silk belt"]=7061, @@ -394,7 +398,6 @@ ns.itemIDs = { ["everyday etiquette"]=220348, ["evil bat eye"]=11404, ["explosive sheep"]=4384, - ["eye of the tempest"]=212792, ["fel elemental rod"]=21939, ["felcloth"]=14256, ["felcloth boots"]=14108, @@ -405,7 +408,6 @@ ns.itemIDs = { ["fire goggles"]=10500, ["fire protection potion"]=6049, ["firebloom"]=4625, - ["fish chunks"]=206345, ["flagon of mead"]=2594, ["flash bomb"]=4852, ["flask of big mojo"]=8152, @@ -413,6 +415,8 @@ ns.itemIDs = { ["flask of oil"]=814, ["flask of petrification"]=13506, ["flask of supreme power"]=13512, + ["flesh picker specimen"]=213567, + ["flint and tinder"]=4471, ["free action potion"]=5634, ["frost oil"]=3829, ["frost protection potion"]=6050, @@ -490,7 +494,7 @@ ns.itemIDs = { ["guardian's moldy card"]=22145, ["gyrochronatom"]=4389, ["gyromatic micro-adjustor"]=10498, - ["harvester gyrostabilizer"]=255010, + ["hay weevil specimen"]=213568, ["healing potion"]=929, ["heart of fire"]=7077, ["heathen's brand"]=19579, @@ -510,10 +514,12 @@ ns.itemIDs = { ["heavy scorpid helm"]=15080, ["heavy scorpid scale"]=15408, ["heavy silk bandage"]=6451, + ["heavy weightstone"]=3241, ["helm of valor"]=16731, ["herbalist's gloves"]=7349, ["hi-explosive bomb"]=10562, ["hillman's cloak"]=3719, + ["holy candle"]=17028, ["horde commendation signet"]=21438, ["horde gift collection"]=22263, ["horn of the arctic wolf"]=12351, @@ -622,6 +628,7 @@ ns.itemIDs = { ["moonsilver blade"]=268484, ["moonsteel broadsword"]=3853, ["moss agate"]=1206, + ["mote of unstable magic"]=274964, ["mummies: a guide to the unsavory undead"]=215820, ["murloc eye"]=730, ["murloc fin"]=1468, @@ -633,6 +640,7 @@ ns.itemIDs = { ["nexus crystal"]=20725, ["night dragon's breath"]=11952, ["nightcrawlers"]=6530, + ["nightmare moss"]=219399, ["nightscape boots"]=8197, ["nightscape headband"]=8176, ["nightscape pants"]=8193, @@ -663,7 +671,6 @@ ns.itemIDs = { ["perfume bottle"]=21829, ["phoenix pants"]=4317, ["pilferer's gloves"]=7358, - ["pine salve"]=206175, ["plated armorfish"]=13890, ["portals deck"]=19277, ["powdered azurite"]=7127, @@ -671,7 +678,6 @@ ns.itemIDs = { ["powerful mojo"]=12804, ["practice lock"]=6712, ["primal hakkari idol"]=22637, - ["primitive drawing"]=211269, ["prismatic shell"]=23250, ["pristine black diamond"]=18335, ["pristine hide of the beast"]=12731, @@ -721,8 +727,8 @@ ns.itemIDs = { ["ryedol's lucky pick"]=4616, ["sanguine sorcery"]=220345, ["savage frond"]=22529, + ["savory stag sliders"]=250065, ["scourge: undead menace or misunderstood?"]=228140, - ["seaforium mining charge"]=206157, ["sealed azure bag"]=19775, ["secrets of the dreamers"]=209846, ["shadow goggles"]=4373, @@ -754,6 +760,7 @@ ns.itemIDs = { ["silvered bronze gauntlets"]=3483, ["silverleaf"]=765, ["simple wildflowers"]=3421, + ["simple wood"]=4470, ["singed scale"]=6486, ["small egg"]=6889, ["small furry paw"]=5134, @@ -891,6 +898,7 @@ ns.itemIDs = { ["wildheart vest"]=16706, ["wildvine"]=8153, ["wildvine potion"]=9144, + ["winter squid"]=13755, ["withered scarf"]=190232, ["wizardweave turban"]=14130, ["wooden figurine"]=190309, diff --git a/README.md b/README.md index 0fb66eb..2425921 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Five small quality-of-life addons for WoW Forever (client 1.60.1, Interface 1600 | Quest Craft Highlight | Highlights profession recipes whose crafted item an active quest needs. | `/qch` | | Vendor Flag | Marks items for 10 minutes after Auctionator warns they would earn more at a vendor. Requires [Auctionator](https://www.curseforge.com/wow/addons/auctionator). | `/vf` | | Quest Shopping List | A panel beside the auction house listing items your quests still need, with cost against the quest's reward. Click to search. Requires [Auctionator](https://www.curseforge.com/wow/addons/auctionator). | `/qsl` | -| Dungeon Pre-Quest | Marks quests whose chain leads to a dungeon quest, in the quest log, NPC quest lists and the quest offer window, with a purple "!" on the minimap for ones you can pick up now. | `/dpq ` | +| Dungeon Pre-Quest | Marks dungeon quests and quests whose chain leads to one, in the quest log, NPC quest lists and the quest offer window, with a purple "!" on the minimap for ones you can pick up now. | `/dpq ` | ## Install diff --git a/tests/test_dpq.lua b/tests/test_dpq.lua index dcc548b..d3007f7 100644 --- a/tests/test_dpq.lua +++ b/tests/test_dpq.lua @@ -108,6 +108,12 @@ local ns = { [72] = { 2, 3, 1024 }, -- druids only (class 11) [73] = { 1, 3, 0, 2, 3, 0, 1, 3, 0 }, -- two dungeons, one repeated [74] = { 0, 3, 0 }, -- dungeon not known by name + [81] = { 2, 3, 0 }, -- also a dungeon quest itself + }, + dungeonQuests = { + [80] = { 1, 1, 0 }, -- Alliance dungeon quest + [81] = { 1, 3, 0 }, + [82] = { 0, 3, 0 }, -- dungeon not known by name }, } assert(loadfile(arg[1]))("DungeonPreQuest", ns) @@ -126,9 +132,15 @@ check(text(99) == nil, "unrelated quest gets no tooltip line") check(text(73) == "Dungeon pre-quest: The Deadmines, Stratholme", "several dungeons, no repeats: " .. tostring(text(73))) check(text(74) == "Dungeon pre-quest", "unknown dungeon still marks: " .. tostring(text(74))) +check(text(80) == "Dungeon quest: The Deadmines", "dungeon quest names its own dungeon: " .. tostring(text(80))) +check(text(81) == "Dungeon quest: The Deadmines\nDungeon pre-quest: Stratholme", "both kinds on separate lines: " .. tostring(text(81))) +check(text(82) == "Dungeon quest", "unknown own dungeon still marks: " .. tostring(text(82))) + check(text(70) ~= nil, "Alliance entry shows for Alliance") faction = "Horde" check(text(70) == nil, "Alliance entry hidden for Horde") +check(text(80) == nil, "Alliance dungeon quest hidden for Horde") +check(text(81) == "Dungeon quest: The Deadmines\nDungeon pre-quest: Stratholme", "shared quest shows for Horde") faction = "Alliance" classID = 1 @@ -149,6 +161,11 @@ rows = { a, b } hooks.QuestLogQuests_Update() check(a.dpqMark and a.dpqMark.shown and a.dpqMark.text:find("D", 1, true), "pre-quest row is marked") check(b.dpqMark == nil, "other row stays unmarked") +local own = button(80) +rows = { own } +hooks.QuestLogQuests_Update() +check(own.dpqMark and own.dpqMark.shown, "dungeon quest row is marked") +rows = { a, b } check(a.dpqMark.text == "|cffc77dff[D]|r", "row uses the [D] tag: " .. tostring(a.dpqMark.text)) check(a.dpqMark.point[2] == a.Text and a.dpqMark.point[4] == 125, "mark sits just after the title: " .. tostring(a.dpqMark.point[4])) diff --git a/tests/test_dpq_minimap.lua b/tests/test_dpq_minimap.lua index 4b45998..1f129a9 100644 --- a/tests/test_dpq_minimap.lua +++ b/tests/test_dpq_minimap.lua @@ -90,8 +90,7 @@ local SKYBORNE = 4294967296 local notForMe = {} local ns = { raceBits = { [7] = 64, [95] = SKYBORNE }, - DungeonsFor = function(id) if notForMe[id] then return nil end return { "The Deadmines" } end, - Describe = function(names) return "Dungeon pre-quest: " .. names[1] end, + Describe = function(id) if notForMe[id] then return nil end return "Dungeon pre-quest: The Deadmines" end, pinQuests = {}, } local function quest(fields)