From 5c4f818984727d9c4c326fe0294b06b64c60705f Mon Sep 17 00:00:00 2001 From: Krullgor Date: Fri, 13 Jan 2023 14:40:08 +0100 Subject: [PATCH 1/5] update to 3.4.1 --- AtlasLootClassic/Addons/Favourites_GUI.lua | 2 +- AtlasLootClassic/AtlasLootClassic.toc | 2 +- AtlasLootClassic/AtlasLootClassic_Wrath.toc | 2 +- AtlasLootClassic/Button/Button.lua | 48 +++-- AtlasLootClassic/Button/Faction_type.lua | 2 +- AtlasLootClassic/Core/TooltipScan.lua | 8 +- AtlasLootClassic/GUI/GUI.lua | 2 +- AtlasLootClassic/GUI/Template_Select.lua | 3 +- AtlasLootClassic/Libs/AceDB-3.0/AceDB-3.0.lua | 14 +- .../AtlasLootClassic_Collections.toc | 2 +- .../AtlasLootClassic_Collections_Wrath.toc | 2 +- .../AtlasLootClassic_Crafting.toc | 2 +- .../AtlasLootClassic_Crafting_Wrath.toc | 2 +- .../AtlasLootClassic_Data.toc | 2 +- .../AtlasLootClassic_Data_Wrath.toc | 2 +- .../AtlasLootClassic_DungeonsAndRaids.toc | 2 +- ...tlasLootClassic_DungeonsAndRaids_Wrath.toc | 2 +- .../AtlasLootClassic_Factions.toc | 2 +- .../AtlasLootClassic_Factions_Wrath.toc | 2 +- .../AtlasLootClassic_Options.toc | 2 +- .../AtlasLootClassic_Options_Wrath.toc | 2 +- .../AceConfigCmd-3.0/AceConfigCmd-3.0.lua | 35 ++- .../AceConfigDialog-3.0.lua | 111 +++++----- .../AceDBOptions-3.0/AceDBOptions-3.0.lua | 6 +- .../Libs/AceGUI-3.0/AceGUI-3.0.lua | 92 ++++---- .../AceGUIContainer-BlizOptionsGroup.lua | 7 +- .../widgets/AceGUIContainer-Frame.lua | 14 +- .../widgets/AceGUIContainer-TabGroup.lua | 200 +++++++++++++++++- .../widgets/AceGUIContainer-TreeGroup.lua | 22 +- .../widgets/AceGUIContainer-Window.lua | 14 +- .../widgets/AceGUIWidget-CheckBox.lua | 20 +- .../widgets/AceGUIWidget-ColorPicker.lua | 4 - .../widgets/AceGUIWidget-DropDown-Items.lua | 8 +- .../widgets/AceGUIWidget-DropDown.lua | 6 +- .../widgets/AceGUIWidget-EditBox.lua | 4 - .../widgets/AceGUIWidget-Keybinding.lua | 4 - .../AceGUI-3.0/widgets/AceGUIWidget-Label.lua | 4 - .../widgets/AceGUIWidget-MultiLineEditBox.lua | 17 +- .../widgets/AceGUIWidget-Slider.lua | 22 +- AtlasLootClassic_PvP/AtlasLootClassic_PvP.toc | 2 +- .../AtlasLootClassic_PvP_Wrath.toc | 2 +- 41 files changed, 434 insertions(+), 267 deletions(-) diff --git a/AtlasLootClassic/Addons/Favourites_GUI.lua b/AtlasLootClassic/Addons/Favourites_GUI.lua index e30784a1..2952625c 100644 --- a/AtlasLootClassic/Addons/Favourites_GUI.lua +++ b/AtlasLootClassic/Addons/Favourites_GUI.lua @@ -341,7 +341,7 @@ local function Slot_CreateSlotButton(parFrame, slotID, modelFrame) frame:RegisterForClicks("AnyDown") -- secButtonTexture - frame.icon = frame:CreateTexture(nil, frame) + frame.icon = frame:CreateTexture(nil, "ARTWORK") frame.icon:SetAllPoints(frame) -- secButtonOverlay diff --git a/AtlasLootClassic/AtlasLootClassic.toc b/AtlasLootClassic/AtlasLootClassic.toc index 84d740a9..11b2dc65 100644 --- a/AtlasLootClassic/AtlasLootClassic.toc +++ b/AtlasLootClassic/AtlasLootClassic.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## SavedVariables: AtlasLootClassicDB diff --git a/AtlasLootClassic/AtlasLootClassic_Wrath.toc b/AtlasLootClassic/AtlasLootClassic_Wrath.toc index 35efc527..8f3bcbb9 100644 --- a/AtlasLootClassic/AtlasLootClassic_Wrath.toc +++ b/AtlasLootClassic/AtlasLootClassic_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## SavedVariables: AtlasLootClassicDB diff --git a/AtlasLootClassic/Button/Button.lua b/AtlasLootClassic/Button/Button.lua index 4f12ed4b..37592345 100644 --- a/AtlasLootClassic/Button/Button.lua +++ b/AtlasLootClassic/Button/Button.lua @@ -9,6 +9,19 @@ mountID = 123, } ]] + +-- Functions +local _G = getfenv(0) + +-- Libraries +local assert, type, tonumber, tostring = assert, type, tonumber, tostring +local next, pairs = next, pairs +local str_sub, str_format, str_len, str_match = string.sub, string.format, string.len, string.match + +local UnitFactionGroup = UnitFactionGroup +local CreateFrame = CreateFrame +local CreateColor = CreateColor + local ALName, ALPrivate = ... local AtlasLoot = _G.AtlasLoot @@ -23,14 +36,6 @@ local AL = AtlasLoot.Locales local GetAlTooltip = AtlasLoot.Tooltip.GetTooltip local DEFAULT_BACKGROUND_COLOR = {0.82, 0.82, 0.82, 0.4} --- lua -local assert, type, tonumber, tostring = assert, type, tonumber, tostring -local next, pairs = next, pairs -local str_sub, str_format, str_len, str_match = string.sub, string.format, string.len, string.match - --- WoW -local CreateFrame = CreateFrame - -- UnitFactionGroup("player") "Alliance", "Horde", "Neutral" or nil. -- :SetAtlas() local WOW_HEAD_LINK, WOW_HEAD_LINK_LOC @@ -235,12 +240,13 @@ function Button:Create() button.background:Hide() -- highlight Background - button.highlightBg = button:CreateTexture(buttonName.."_highlightBg") - button.highlightBg:SetPoint("TOPLEFT", button, "TOPLEFT", 0, 0) - button.highlightBg:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -(button:GetWidth()/2), 0) - button.highlightBg:SetColorTexture(1,0,0) - button.highlightBg:SetGradientAlpha("HORIZONTAL", 1, 1, 1, 0.45, 1, 1, 1, 0) - button.highlightBg:Hide() + local highlightBg = button:CreateTexture(buttonName.."_highlightBg") + highlightBg:SetPoint("TOPLEFT", button, "TOPLEFT", 0, 0) + highlightBg:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -(button:GetWidth()/2), 0) + highlightBg:SetColorTexture(1,0,0) + highlightBg:SetGradient("HORIZONTAL", CreateColor(1, 1, 1, 0.45), CreateColor(1, 1, 1, 0)) + highlightBg:Hide() + button.highlightBg = highlightBg -- Icon button.icon = button:CreateTexture(buttonName.."_icon") @@ -347,20 +353,20 @@ function Button:Create() button.secButton:RegisterForClicks("AnyDown") -- secButtonTexture - button.secButton.icon = button.secButton:CreateTexture(buttonName.."_secButtonIcon", button.secButton) + button.secButton.icon = button.secButton:CreateTexture(buttonName.."_secButtonIcon") button.secButton.icon:SetDrawLayer("ARTWORK", 0) button.secButton.icon:SetAllPoints(button.secButton) button.secButton.icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark") --[[ - button.secButton.qualityBorder = button.secButton:CreateTexture(buttonName.."_secButtonQualityBorder") + button.secButton.qualityBorder = button.secButton:CreateTexture(buttonName.."_secButtonQualityBorder", "ARTWORK") button.secButton.qualityBorder:SetAllPoints(button.secButton) button.secButton.qualityBorder:SetTexture("Interface\\Common\\WhiteIconFrame") button.secButton.qualityBorder:Hide() ]]-- -- secButtonMini - button.secButton.mini = button.secButton:CreateTexture(buttonName.."_secButtonMini") + button.secButton.mini = button.secButton:CreateTexture(buttonName.."_secButtonMini", "ARTWORK") button.secButton.mini:SetDrawLayer(button.secButton.icon:GetDrawLayer(), 1) button.secButton.mini:SetPoint("TOPRIGHT", button.secButton.icon, "TOPRIGHT", 0, 0) button.secButton.mini:SetHeight(13) @@ -417,7 +423,7 @@ function Button:Create() button.secButton.favourite:Hide() -- factionIcon - button.factionIcon = button:CreateTexture(buttonName.."_factionIcon", button) + button.factionIcon = button:CreateTexture(buttonName.."_factionIcon", "ARTWORK") button.factionIcon:SetPoint("RIGHT", button.secButton, "LEFT", -2, 0) button.factionIcon:SetHeight(28) button.factionIcon:SetWidth(28) @@ -458,20 +464,20 @@ function Button:CreateSecOnly(frame) button.secButton:RegisterForClicks("AnyDown") -- secButtonTexture - button.secButton.icon = button.secButton:CreateTexture(buttonName.."_secButtonIcon", button.secButton) + button.secButton.icon = button.secButton:CreateTexture(buttonName.."_secButtonIcon", "ARTWORK") button.secButton.icon:SetDrawLayer("ARTWORK", 0) button.secButton.icon:SetAllPoints(button.secButton) button.secButton.icon:SetTexture("Interface\\Icons\\INV_Misc_QuestionMark") --[[ - button.secButton.qualityBorder = button.secButton:CreateTexture(buttonName.."_secButtonQualityBorder") + button.secButton.qualityBorder = button.secButton:CreateTexture(buttonName.."_secButtonQualityBorder", "ARTWORK") button.secButton.qualityBorder:SetAllPoints(button.secButton) button.secButton.qualityBorder:SetTexture("Interface\\Common\\WhiteIconFrame") button.secButton.qualityBorder:Hide() ]]-- -- secButtonMini - button.secButton.mini = button.secButton:CreateTexture(buttonName.."_secButtonMini") + button.secButton.mini = button.secButton:CreateTexture(buttonName.."_secButtonMini", "ARTWORK") button.secButton.mini:SetDrawLayer(button.secButton.icon:GetDrawLayer(), 1) button.secButton.mini:SetPoint("TOPRIGHT", button.secButton.icon, "TOPRIGHT", 0, 0) button.secButton.mini:SetHeight(13) diff --git a/AtlasLootClassic/Button/Faction_type.lua b/AtlasLootClassic/Button/Faction_type.lua index 9531f7c3..e8d469d7 100644 --- a/AtlasLootClassic/Button/Faction_type.lua +++ b/AtlasLootClassic/Button/Faction_type.lua @@ -303,7 +303,7 @@ function Faction.ShowToolTipFrame(button) insets = { left = 4, right = 4, top = 4, bottom = 4 }}) frame:SetBackdropColor(0,0,0,1) - frame.icon = frame:CreateTexture(name.."-icon", frame) + frame.icon = frame:CreateTexture(name.."-icon", "ARTWORK") frame.icon:SetPoint("TOPLEFT", frame, "TOPLEFT", 5, -5) frame.icon:SetHeight(15) frame.icon:SetWidth(15) diff --git a/AtlasLootClassic/Core/TooltipScan.lua b/AtlasLootClassic/Core/TooltipScan.lua index 3d26c083..b1edded5 100644 --- a/AtlasLootClassic/Core/TooltipScan.lua +++ b/AtlasLootClassic/Core/TooltipScan.lua @@ -69,7 +69,7 @@ local function OnTooltipSetQuest(self) self.questID = nil self.arg1 = nil self.curQuery = nil - self:SetScript("OnTooltipSetQuest", nil) + --self:SetScript("OnTooltipSetQuest", nil) self:Hide() -- give the query a little bit time and it works perfect for more than 1 query :) C_Timer_After(0.05, SetNextQuery) @@ -81,7 +81,7 @@ function TooltipScan.GetQuestName(questID, onGetFunc, arg1, preSetQuery) if not questID then return end if queryCache.quest[questID] then onGetFunc( queryCache.quest[questID], arg1 ) - AtlasLootQueryTooltip:SetScript("OnTooltipSetQuest", nil) + --AtlasLootQueryTooltip:SetScript("OnTooltipSetQuest", nil) AtlasLootQueryTooltip.onGetFunc = nil AtlasLootQueryTooltip.questID = nil AtlasLootQueryTooltip.arg1 = nil @@ -102,7 +102,7 @@ function TooltipScan.GetQuestName(questID, onGetFunc, arg1, preSetQuery) AtlasLootQueryTooltip.questID = questID AtlasLootQueryTooltip.arg1 = arg1 AtlasLootQueryTooltip.curQuery = preSetQuery - AtlasLootQueryTooltip:SetScript("OnTooltipSetQuest", OnTooltipSetQuest) + --AtlasLootQueryTooltip:SetScript("OnTooltipSetQuest", OnTooltipSetQuest) AtlasLootQueryTooltip:Show() AtlasLootQueryTooltip:SetHyperlink("quest:"..questID) return preSetQuery @@ -114,7 +114,7 @@ function TooltipScan.Remove(listEntry) AtlasLootQueryTooltip.questID = nil AtlasLootQueryTooltip.arg1 = nil AtlasLootQueryTooltip.curQuery = nil - AtlasLootQueryTooltip:SetScript("OnTooltipSetQuest", nil) + --AtlasLootQueryTooltip:SetScript("OnTooltipSetQuest", nil) AtlasLootQueryTooltip:Hide() SetNextQuery() else diff --git a/AtlasLootClassic/GUI/GUI.lua b/AtlasLootClassic/GUI/GUI.lua index e11405e7..75fd77e1 100644 --- a/AtlasLootClassic/GUI/GUI.lua +++ b/AtlasLootClassic/GUI/GUI.lua @@ -1166,7 +1166,7 @@ function GUI:Create() frame.difficulty:SetParPoint("TOPRIGHT", frame, "TOPRIGHT", -10, -40) frame.difficulty:SetWidth(320) frame.difficulty:SetNumEntrys(2) - frame.difficulty:ShowSelectedCoin(false) + frame.difficulty:ShowSelectedCoin(true) frame.difficulty:SetButtonOnClick(DifficultySelectFunction) frame.boss = GUI:CreateSelect() diff --git a/AtlasLootClassic/GUI/Template_Select.lua b/AtlasLootClassic/GUI/Template_Select.lua index 83c8dc87..901e24a4 100644 --- a/AtlasLootClassic/GUI/Template_Select.lua +++ b/AtlasLootClassic/GUI/Template_Select.lua @@ -229,7 +229,8 @@ do frame = CreateFrame("CheckButton", frameName) frame:SetHeight(self.buttonHeight) frame:SetHighlightTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD") - frame:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD") + -- Below will now cover the text and currently not transparent + --frame:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD") frame:RegisterForClicks("LeftButtonDown", "RightButtonDown") frame:SetChecked(false) frame:SetScript("OnClick", ButtonOnClick) diff --git a/AtlasLootClassic/Libs/AceDB-3.0/AceDB-3.0.lua b/AtlasLootClassic/Libs/AceDB-3.0/AceDB-3.0.lua index 440330f2..804cf2be 100644 --- a/AtlasLootClassic/Libs/AceDB-3.0/AceDB-3.0.lua +++ b/AtlasLootClassic/Libs/AceDB-3.0/AceDB-3.0.lua @@ -40,7 +40,7 @@ -- end -- @class file -- @name AceDB-3.0.lua --- @release $Id: AceDB-3.0.lua 1217 2019-07-11 03:06:18Z funkydude $ +-- @release $Id: AceDB-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $ local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27 local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR) @@ -53,10 +53,6 @@ local setmetatable, rawset, rawget = setmetatable, rawset, rawget -- WoW APIs local _G = _G --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: LibStub - AceDB.db_registry = AceDB.db_registry or {} AceDB.frame = AceDB.frame or CreateFrame("Frame") @@ -98,11 +94,11 @@ local function copyDefaults(dest, src) -- This is a metatable used for table defaults local mt = { -- This handles the lookup and creation of new subtables - __index = function(t,k) - if k == nil then return nil end + __index = function(t,k2) + if k2 == nil then return nil end local tbl = {} copyDefaults(tbl, v) - rawset(t, k, tbl) + rawset(t, k2, tbl) return tbl end, } @@ -115,7 +111,7 @@ local function copyDefaults(dest, src) end else -- Values are not tables, so this is just a simple return - local mt = {__index = function(t,k) return k~=nil and v or nil end} + local mt = {__index = function(t,k2) return k2~=nil and v or nil end} setmetatable(dest, mt) end elseif type(v) == "table" then diff --git a/AtlasLootClassic_Collections/AtlasLootClassic_Collections.toc b/AtlasLootClassic_Collections/AtlasLootClassic_Collections.toc index 09d33486..bbeb1120 100644 --- a/AtlasLootClassic_Collections/AtlasLootClassic_Collections.toc +++ b/AtlasLootClassic_Collections/AtlasLootClassic_Collections.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Wrath.toc b/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Wrath.toc index 09d33486..bbeb1120 100644 --- a/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Wrath.toc +++ b/AtlasLootClassic_Collections/AtlasLootClassic_Collections_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting.toc b/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting.toc index 5ecc779f..13440832 100644 --- a/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting.toc +++ b/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting_Wrath.toc b/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting_Wrath.toc index 56cd3983..7f9f6224 100644 --- a/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting_Wrath.toc +++ b/AtlasLootClassic_Crafting/AtlasLootClassic_Crafting_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Data/AtlasLootClassic_Data.toc b/AtlasLootClassic_Data/AtlasLootClassic_Data.toc index 05837101..c345b81d 100644 --- a/AtlasLootClassic_Data/AtlasLootClassic_Data.toc +++ b/AtlasLootClassic_Data/AtlasLootClassic_Data.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Data/AtlasLootClassic_Data_Wrath.toc b/AtlasLootClassic_Data/AtlasLootClassic_Data_Wrath.toc index 05837101..c345b81d 100644 --- a/AtlasLootClassic_Data/AtlasLootClassic_Data_Wrath.toc +++ b/AtlasLootClassic_Data/AtlasLootClassic_Data_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids.toc b/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids.toc index e725aaf6..cd83dab3 100644 --- a/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids.toc +++ b/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids_Wrath.toc b/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids_Wrath.toc index 374696f1..355ef465 100644 --- a/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids_Wrath.toc +++ b/AtlasLootClassic_DungeonsAndRaids/AtlasLootClassic_DungeonsAndRaids_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Factions/AtlasLootClassic_Factions.toc b/AtlasLootClassic_Factions/AtlasLootClassic_Factions.toc index 47c2de32..447a0c24 100644 --- a/AtlasLootClassic_Factions/AtlasLootClassic_Factions.toc +++ b/AtlasLootClassic_Factions/AtlasLootClassic_Factions.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Factions/AtlasLootClassic_Factions_Wrath.toc b/AtlasLootClassic_Factions/AtlasLootClassic_Factions_Wrath.toc index 9c63fb24..95fa33fb 100644 --- a/AtlasLootClassic_Factions/AtlasLootClassic_Factions_Wrath.toc +++ b/AtlasLootClassic_Factions/AtlasLootClassic_Factions_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Options/AtlasLootClassic_Options.toc b/AtlasLootClassic_Options/AtlasLootClassic_Options.toc index 05ba2e12..ffeef16f 100644 --- a/AtlasLootClassic_Options/AtlasLootClassic_Options.toc +++ b/AtlasLootClassic_Options/AtlasLootClassic_Options.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Options/AtlasLootClassic_Options_Wrath.toc b/AtlasLootClassic_Options/AtlasLootClassic_Options_Wrath.toc index 05ba2e12..ffeef16f 100644 --- a/AtlasLootClassic_Options/AtlasLootClassic_Options_Wrath.toc +++ b/AtlasLootClassic_Options/AtlasLootClassic_Options_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua b/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua index 5113875a..6dd64383 100644 --- a/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua +++ b/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua @@ -1,7 +1,7 @@ --- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames. -- @class file -- @name AceConfigCmd-3.0 --- @release $Id: AceConfigCmd-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $ +-- @release $Id: AceConfigCmd-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $ --[[ AceConfigCmd-3.0 @@ -37,17 +37,10 @@ local error, assert = error, assert -- WoW APIs local _G = _G --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: LibStub, SELECTED_CHAT_FRAME, DEFAULT_CHAT_FRAME - - local L = setmetatable({}, { -- TODO: replace with proper locale __index = function(self,k) return k end }) - - local function print(msg) (SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg) end @@ -401,7 +394,7 @@ local function handle(info, inputpos, tab, depth, retfalse) return end - local str = strsub(info.input,inputpos); + local strInput = strsub(info.input,inputpos); if tab.type=="execute" then ------------ execute -------------------------------------------- @@ -414,21 +407,21 @@ local function handle(info, inputpos, tab, depth, retfalse) local res = true if tab.pattern then - if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end - if not strmatch(str, tab.pattern) then - usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"]) + if type(tab.pattern)~="string" then err(info, inputpos, "'pattern' - expected a string") end + if not strmatch(strInput, tab.pattern) then + usererr(info, inputpos, "'"..strInput.."' - " .. L["invalid input"]) return end end - do_final(info, inputpos, tab, "set", str) + do_final(info, inputpos, tab, "set", strInput) elseif tab.type=="toggle" then ------------ toggle -------------------------------------------- local b - local str = strtrim(strlower(str)) + local str = strtrim(strlower(strInput)) if str=="" then b = callmethod(info, inputpos, tab, "get") @@ -465,9 +458,9 @@ local function handle(info, inputpos, tab, depth, retfalse) elseif tab.type=="range" then ------------ range -------------------------------------------- - local val = tonumber(str) + local val = tonumber(strInput) if not val then - usererr(info, inputpos, "'"..str.."' - "..L["expected number"]) + usererr(info, inputpos, "'"..strInput.."' - "..L["expected number"]) return end if type(info.step)=="number" then @@ -487,7 +480,7 @@ local function handle(info, inputpos, tab, depth, retfalse) elseif tab.type=="select" then ------------ select ------------------------------------ - local str = strtrim(strlower(str)) + local str = strtrim(strlower(strInput)) local values = tab.values if type(values) == "function" or type(values) == "string" then @@ -528,7 +521,7 @@ local function handle(info, inputpos, tab, depth, retfalse) elseif tab.type=="multiselect" then ------------ multiselect ------------------------------------------- - local str = strtrim(strlower(str)) + local str = strtrim(strlower(strInput)) local values = tab.values if type(values) == "function" or type(values) == "string" then @@ -565,7 +558,7 @@ local function handle(info, inputpos, tab, depth, retfalse) --check that the opt is valid local ok - for k,v in pairs(values) do + for k in pairs(values) do if strlower(k)==opt then opt = k -- overwrite with key (in case of case mismatches) ok = true @@ -634,7 +627,7 @@ local function handle(info, inputpos, tab, depth, retfalse) elseif tab.type=="color" then ------------ color -------------------------------------------- - local str = strtrim(strlower(str)) + local str = strtrim(strlower(strInput)) if str == "" then --TODO: Show current value return @@ -706,7 +699,7 @@ local function handle(info, inputpos, tab, depth, retfalse) elseif tab.type=="keybinding" then ------------ keybinding -------------------------------------------- - local str = strtrim(strlower(str)) + local str = strtrim(strlower(strInput)) if str == "" then --TODO: Show current value return diff --git a/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua index 0a958ce6..4649c73b 100644 --- a/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua +++ b/AtlasLootClassic_Options/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua @@ -1,13 +1,13 @@ --- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables. -- @class file -- @name AceConfigDialog-3.0 --- @release $Id: AceConfigDialog-3.0.lua 1262 2022-04-07 23:00:32Z funkehdude $ +-- @release $Id: AceConfigDialog-3.0.lua 1292 2022-09-29 08:00:11Z nevcairiel $ local LibStub = LibStub local gui = LibStub("AceGUI-3.0") local reg = LibStub("AceConfigRegistry-3.0") -local MAJOR, MINOR = "AceConfigDialog-3.0", 82 +local MAJOR, MINOR = "AceConfigDialog-3.0", 85 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not AceConfigDialog then return end @@ -29,12 +29,6 @@ local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unp local tostring, tonumber = tostring, tonumber local math_min, math_max, math_floor = math.min, math.max, math.floor --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: NORMAL_FONT_COLOR, ACCEPT, CANCEL --- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge --- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler - local emptyTbl = {} --[[ @@ -194,9 +188,8 @@ local function GetOptionsMemberValue(membername, option, options, path, appName, --We have a function to call local info = new() --traverse the options table, picking up the handler and filling the info with the path - local handler local group = options - handler = group.handler or handler + local handler = group.handler for i = 1, #path do group = GetSubOption(group, path[i]) @@ -535,8 +528,7 @@ local function OptionOnMouseLeave(widget, event) end local function GetFuncName(option) - local type = option.type - if type == "execute" then + if option.type == "execute" then return "func" else return "set" @@ -576,7 +568,7 @@ do text:SetPoint("TOP", 0, -16) frame.text = text - local function newButton(text) + local function newButton(newText) local button = CreateFrame("Button", nil, frame) button:SetSize(128, 21) button:SetNormalFontObject(GameFontNormal) @@ -587,7 +579,7 @@ do button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875) button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight" button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875) - button:SetText(text) + button:SetText(newText) return button end @@ -674,7 +666,7 @@ local function ActivateControl(widget, event, ...) if group[funcname] ~= nil then func = group[funcname] end - handler = group.handler or handler + handler = group.handler confirm = group.confirm validate = group.validate for i = 1, #path do @@ -738,7 +730,6 @@ local function ActivateControl(widget, event, ...) end end - local rootframe = user.rootframe if not validated or type(validated) == "string" then if not validated then if usage then @@ -753,8 +744,8 @@ local function ActivateControl(widget, event, ...) end -- show validate message - if rootframe.SetStatusText then - rootframe:SetStatusText(validated) + if user.rootframe.SetStatusText then + user.rootframe:SetStatusText(validated) else validationErrorPopup(validated) end @@ -791,14 +782,14 @@ local function ActivateControl(widget, event, ...) if type(confirm) == "boolean" then if confirm then if not confirmText then - local name, desc = option.name, option.desc - if type(name) == "function" then - name = name(info) + local option_name, desc = option.name, option.desc + if type(option_name) == "function" then + option_name = option_name(info) end if type(desc) == "function" then desc = desc(info) end - confirmText = name + confirmText = option_name if desc then confirmText = confirmText.." - "..desc end @@ -1140,8 +1131,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin --Control to feed local control - local name = GetOptionsMemberValue("name", v, options, path, appName) - if v.type == "execute" then local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName) @@ -1244,7 +1233,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin end tsort(sorting, sortTblAsStrings) end - for k, value in ipairs(sorting) do + for _, value in ipairs(sorting) do local text = values[value] local radio = gui:Create("CheckBox") radio:SetLabel(text) @@ -1326,8 +1315,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin control:SetWidth(width_multiplier) end --check:SetTriState(v.tristate) - for i = 1, #valuesort do - local key = valuesort[i] + for s = 1, #valuesort do + local key = valuesort[s] local value = GetOptionsMemberValue("get",v, options, path, appName, key) control:SetItemValue(key,value) end @@ -1339,8 +1328,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin control:PauseLayout() local width = GetOptionsMemberValue("width",v,options,path,appName) - for i = 1, #valuesort do - local value = valuesort[i] + for s = 1, #valuesort do + local value = valuesort[s] local text = values[value] local check = gui:Create("CheckBox") check:SetLabel(text) @@ -1427,8 +1416,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin end control:SetImageSize(width, height) end - local width = GetOptionsMemberValue("width",v,options,path,appName) - control.width = not width and "fill" + local controlWidth = GetOptionsMemberValue("width",v,options,path,appName) + control.width = not controlWidth and "fill" end --Common Init @@ -1683,29 +1672,29 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR elseif grouptype == "select" then - local select = gui:Create("DropdownGroup") - select:SetTitle(name) - InjectInfo(select, options, group, path, rootframe, appName) - select:SetCallback("OnGroupSelected", GroupSelected) + local selectGroup = gui:Create("DropdownGroup") + selectGroup:SetTitle(name) + InjectInfo(selectGroup, options, group, path, rootframe, appName) + selectGroup:SetCallback("OnGroupSelected", GroupSelected) local status = AceConfigDialog:GetStatusTable(appName, path) if not status.groups then status.groups = {} end - select:SetStatusTable(status.groups) + selectGroup:SetStatusTable(status.groups) local grouplist, orderlist = BuildSelect(group, options, path, appName) - select:SetGroupList(grouplist, orderlist) - select:SetUserData("grouplist", grouplist) - select:SetUserData("orderlist", orderlist) + selectGroup:SetGroupList(grouplist, orderlist) + selectGroup:SetUserData("grouplist", grouplist) + selectGroup:SetUserData("orderlist", orderlist) local firstgroup = orderlist[1] if firstgroup then - select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup) + selectGroup:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup) end - select.width = "fill" - select.height = "fill" + selectGroup.width = "fill" + selectGroup.height = "fill" - container:AddChild(select) + container:AddChild(selectGroup) --assume tree group by default --if parenttype is tree then this group is already a node on that tree @@ -1933,13 +1922,13 @@ end -- convert pre-39 BlizOptions structure to the new format if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then local old = AceConfigDialog.BlizOptions - local new = {} + local newOpt = {} for key, widget in pairs(old) do local appName = widget:GetUserData("appName") - if not new[appName] then new[appName] = {} end - new[appName][key] = widget + if not newOpt[appName] then newOpt[appName] = {} end + newOpt[appName][key] = widget end - AceConfigDialog.BlizOptions = new + AceConfigDialog.BlizOptions = newOpt else AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {} end @@ -1972,6 +1961,7 @@ end -- @param parent The parent to use in the interface options tree. -- @param ... The path in the options table to feed into the interface options panel. -- @return The reference to the frame registered into the Interface Options. +-- @return The category ID to pass to Settings.OpenToCategory (or InterfaceOptionsFrame_OpenToCategory) function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) local BlizOptions = AceConfigDialog.BlizOptions @@ -1987,7 +1977,6 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) if not BlizOptions[appName][key] then local group = gui:Create("BlizOptionsGroup") BlizOptions[appName][key] = group - group:SetName(name or appName, parent) group:SetTitle(name or appName) group:SetUserData("appName", appName) @@ -2000,8 +1989,30 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) end group:SetCallback("OnShow", FeedToBlizPanel) group:SetCallback("OnHide", ClearBlizPanel) - InterfaceOptions_AddCategory(group.frame) - return group.frame + if Settings and Settings.RegisterCanvasLayoutCategory then + local categoryName = name or appName + if parent then + local category = Settings.GetCategory(parent) + if not category then + error(("The parent category '%s' was not found"):format(parent), 2) + end + local subcategory = Settings.RegisterCanvasLayoutSubcategory(category, group.frame, categoryName) + + -- force the generated ID to be used for subcategories, as these can have very simple names like "Profiles" + group:SetName(subcategory.ID, parent) + else + local category = Settings.RegisterCanvasLayoutCategory(group.frame, categoryName) + -- using appName here would be cleaner, but would not be 100% compatible + -- but for top-level categories it should be fine, as these are typically addon names + category.ID = categoryName + group:SetName(categoryName, parent) + Settings.RegisterAddOnCategory(category) + end + else + group:SetName(name or appName, parent) + InterfaceOptions_AddCategory(group.frame) + end + return group.frame, group.frame.name else error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2) end diff --git a/AtlasLootClassic_Options/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua b/AtlasLootClassic_Options/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua index 6ed3103e..9029c667 100644 --- a/AtlasLootClassic_Options/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua +++ b/AtlasLootClassic_Options/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua @@ -1,7 +1,7 @@ --- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles. -- @class file -- @name AceDBOptions-3.0 --- @release $Id: AceDBOptions-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $ +-- @release $Id: AceDBOptions-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $ local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15 local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR) @@ -13,10 +13,6 @@ local pairs, next = pairs, next -- WoW APIs local UnitClass = UnitClass --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE - AceDBOptions.optionTables = AceDBOptions.optionTables or {} AceDBOptions.handlers = AceDBOptions.handlers or {} diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/AceGUI-3.0.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/AceGUI-3.0.lua index 438650f3..f05b1ed2 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/AceGUI-3.0.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/AceGUI-3.0.lua @@ -24,7 +24,7 @@ -- f:AddChild(btn) -- @class file -- @name AceGUI-3.0 --- @release $Id: AceGUI-3.0.lua 1247 2021-01-23 23:16:39Z funkehdude $ +-- @release $Id: AceGUI-3.0.lua 1288 2022-09-25 14:19:00Z funkehdude $ local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41 local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR) @@ -35,17 +35,11 @@ local tinsert, wipe = table.insert, table.wipe local select, pairs, next, type = select, pairs, next, type local error, assert = error, assert local setmetatable, rawget = setmetatable, rawget -local math_max = math.max +local math_max, math_min, math_ceil = math.max, math.min, math.ceil -- WoW APIs local UIParent = UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: geterrorhandler, LibStub - ---local con = LibStub("AceConsole-3.0",true) - AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {} AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {} AceGUI.WidgetBase = AceGUI.WidgetBase or {} @@ -94,38 +88,38 @@ do AceGUI.objPools = AceGUI.objPools or {} local objPools = AceGUI.objPools --Returns a new instance, if none are available either returns a new table or calls the given contructor - function newWidget(type) - if not WidgetRegistry[type] then + function newWidget(widgetType) + if not WidgetRegistry[widgetType] then error("Attempt to instantiate unknown widget type", 2) end - if not objPools[type] then - objPools[type] = {} + if not objPools[widgetType] then + objPools[widgetType] = {} end - local newObj = next(objPools[type]) + local newObj = next(objPools[widgetType]) if not newObj then - newObj = WidgetRegistry[type]() - newObj.AceGUIWidgetVersion = WidgetVersions[type] + newObj = WidgetRegistry[widgetType]() + newObj.AceGUIWidgetVersion = WidgetVersions[widgetType] else - objPools[type][newObj] = nil + objPools[widgetType][newObj] = nil -- if the widget is older then the latest, don't even try to reuse it -- just forget about it, and grab a new one. - if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then - return newWidget(type) + if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[widgetType] then + return newWidget(widgetType) end end return newObj end -- Releases an instance to the Pool - function delWidget(obj,type) - if not objPools[type] then - objPools[type] = {} + function delWidget(obj,widgetType) + if not objPools[widgetType] then + objPools[widgetType] = {} end - if objPools[type][obj] then + if objPools[widgetType][obj] then error("Attempt to Release Widget that is already released", 2) end - objPools[type][obj] = true + objPools[widgetType][obj] = true end end @@ -141,9 +135,9 @@ end -- OnAcquire function on it, before returning. -- @param type The type of the widget. -- @return The newly created widget. -function AceGUI:Create(type) - if WidgetRegistry[type] then - local widget = newWidget(type) +function AceGUI:Create(widgetType) + if WidgetRegistry[widgetType] then + local widget = newWidget(widgetType) if rawget(widget, "Acquire") then widget.OnAcquire = widget.Acquire @@ -161,7 +155,7 @@ function AceGUI:Create(type) if widget.OnAcquire then widget:OnAcquire() else - error(("Widget type %s doesn't supply an OnAcquire Function"):format(type)) + error(("Widget type %s doesn't supply an OnAcquire Function"):format(widgetType)) end -- Set the default Layout ("List") safecall(widget.SetLayout, widget, "List") @@ -589,25 +583,25 @@ AceGUI.counts = AceGUI.counts or {} -- This is used by widgets that require a named frame, e.g. when a Blizzard -- Template requires it. -- @param type The widget type -function AceGUI:GetNextWidgetNum(type) - if not self.counts[type] then - self.counts[type] = 0 +function AceGUI:GetNextWidgetNum(widgetType) + if not self.counts[widgetType] then + self.counts[widgetType] = 0 end - self.counts[type] = self.counts[type] + 1 - return self.counts[type] + self.counts[widgetType] = self.counts[widgetType] + 1 + return self.counts[widgetType] end --- Return the number of created widgets for this type. -- In contrast to GetNextWidgetNum, the number is not incremented. --- @param type The widget type -function AceGUI:GetWidgetCount(type) - return self.counts[type] or 0 +-- @param widgetType The widget type +function AceGUI:GetWidgetCount(widgetType) + return self.counts[widgetType] or 0 end --- Return the version of the currently registered widget type. --- @param type The widget type -function AceGUI:GetWidgetVersion(type) - return WidgetVersions[type] +-- @param widgetType The widget type +function AceGUI:GetWidgetVersion(widgetType) + return WidgetVersions[widgetType] end ------------- @@ -770,7 +764,6 @@ AceGUI:RegisterLayout("Flow", usedwidth = 0 rowstart = frame - rowstartoffset = frameoffset if child.DoLayout then child:DoLayout() @@ -813,7 +806,8 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child) or colObj and (colObj["align" .. dir] or colObj.align) or tableObj["align" .. dir] or tableObj.align or "CENTERLEFT" - local child, cell, val = child or 0, cell or 0, nil + local val + child, cell = child or 0, cell or 0 if type(fn) == "string" then fn = fn:lower() @@ -827,7 +821,7 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child) val = fn end - return fn, max(0, min(val, cell)) + return fn, math_max(0, math_min(val, cell)) end -- Get width or height for multiple cells combined @@ -836,7 +830,7 @@ local GetCellDimension = function (dir, laneDim, from, to, space) for cell=from,to do dim = dim + (laneDim[cell] or 0) end - return dim + max(0, to - from) * (space or 0) + return dim + math_max(0, to - from) * (space or 0) end --[[ Options @@ -882,7 +876,7 @@ AceGUI:RegisterLayout("Table", repeat n = n + 1 local col = (n - 1) % #cols + 1 - local row = ceil(n / #cols) + local row = math_ceil(n / #cols) local rowspan = rowspans[col] local cell = rowspan and rowspan.child or child local cellObj = cell:GetUserData("cell") @@ -898,7 +892,7 @@ AceGUI:RegisterLayout("Table", end -- Colspan - local colspan = max(0, min((cellObj and cellObj.colspan or 1) - 1, #cols - col)) + local colspan = math_max(0, math_min((cellObj and cellObj.colspan or 1) - 1, #cols - col)) n = n + colspan -- Place the cell @@ -915,7 +909,7 @@ AceGUI:RegisterLayout("Table", end end - local rows = ceil(n / #cols) + local rows = math_ceil(n / #cols) -- Determine fixed size cols and collect weights local extantH, totalWeight = totalH, 0 @@ -940,16 +934,16 @@ AceGUI:RegisterLayout("Table", f:ClearAllPoints() local childH = f:GetWidth() or 0 - laneH[col] = max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH)) + laneH[col] = math_max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH)) end end - laneH[col] = max(colObj.min or colObj[1] or 0, min(laneH[col], colObj.max or colObj[2] or laneH[col])) + laneH[col] = math_max(colObj.min or colObj[1] or 0, math_min(laneH[col], colObj.max or colObj[2] or laneH[col])) else -- Rel./Abs. width laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width end - extantH = max(0, extantH - laneH[col]) + extantH = math_max(0, extantH - laneH[col]) end end @@ -988,7 +982,7 @@ AceGUI:RegisterLayout("Table", child:DoLayout() end - rowV = max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV)) + rowV = math_max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV)) end end diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua index 2f8ba043..d95db58e 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua @@ -2,7 +2,7 @@ BlizOptionsGroup Container Simple container widget for the integration of AceGUI into the Blizzard Interface Options -------------------------------------------------------------------------------]] -local Type, Version = "BlizOptionsGroup", 22 +local Type, Version = "BlizOptionsGroup", 26 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -108,6 +108,11 @@ local function Constructor() frame.default = default frame.refresh = refresh + -- 10.0 support function aliases (cancel has been removed) + frame.OnCommit = okay + frame.OnDefault = default + frame.OnRefresh = refresh + frame:SetScript("OnHide", OnHide) frame:SetScript("OnShow", OnShow) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua index 738462ef..39a1004a 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua @@ -1,7 +1,7 @@ --[[----------------------------------------------------------------------------- Frame Container -------------------------------------------------------------------------------]] -local Type, Version = "Frame", 28 +local Type, Version = "Frame", 30 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -13,10 +13,6 @@ local wipe = table.wipe local PlaySound = PlaySound local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: CLOSE - --[[----------------------------------------------------------------------------- Scripts -------------------------------------------------------------------------------]] @@ -190,7 +186,11 @@ local function Constructor() frame:SetFrameLevel(100) -- Lots of room to draw under it frame:SetBackdrop(FrameBackdrop) frame:SetBackdropColor(0, 0, 0, 1) - frame:SetMinResize(400, 200) + if frame.SetResizeBounds then -- WoW 10.0 + frame:SetResizeBounds(400, 200) + else + frame:SetMinResize(400, 200) + end frame:SetToplevel(true) frame:SetScript("OnShow", Frame_OnShow) frame:SetScript("OnHide", Frame_OnClose) @@ -271,7 +271,7 @@ local function Constructor() line2:SetHeight(8) line2:SetPoint("BOTTOMRIGHT", -8, 8) line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - local x = 0.1 * 8/17 + x = 0.1 * 8/17 line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) local sizer_s = CreateFrame("Frame", nil, frame) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua index 8eaed65b..8e468764 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua @@ -2,7 +2,7 @@ TabGroup Container Container that uses tabs on top to switch between groups. -------------------------------------------------------------------------------]] -local Type, Version = "TabGroup", 37 +local Type, Version = "TabGroup", 38 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -14,10 +14,6 @@ local PlaySound = PlaySound local CreateFrame, UIParent = CreateFrame, UIParent local _G = _G --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab - -- local upvalue storage used by BuildTabs local widths = {} local rowwidths = {} @@ -26,6 +22,143 @@ local rowends = {} --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] + +local function PanelTemplates_TabResize(tab, padding, absoluteSize, minWidth, maxWidth, absoluteTextSize) + local tabName = tab:GetName(); + + local buttonMiddle = tab.Middle or tab.middleTexture or _G[tabName.."Middle"]; + local buttonMiddleDisabled = tab.MiddleDisabled or (tabName and _G[tabName.."MiddleDisabled"]); + local left = tab.Left or tab.leftTexture or _G[tabName.."Left"]; + local sideWidths = 2 * left:GetWidth(); + local tabText = tab.Text or _G[tab:GetName().."Text"]; + local highlightTexture = tab.HighlightTexture or (tabName and _G[tabName.."HighlightTexture"]); + + local width, tabWidth; + local textWidth; + if ( absoluteTextSize ) then + textWidth = absoluteTextSize; + else + tabText:SetWidth(0); + textWidth = tabText:GetWidth(); + end + -- If there's an absolute size specified then use it + if ( absoluteSize ) then + if ( absoluteSize < sideWidths) then + width = 1; + tabWidth = sideWidths + else + width = absoluteSize - sideWidths; + tabWidth = absoluteSize + end + tabText:SetWidth(width); + else + -- Otherwise try to use padding + if ( padding ) then + width = textWidth + padding; + else + width = textWidth + 24; + end + -- If greater than the maxWidth then cap it + if ( maxWidth and width > maxWidth ) then + if ( padding ) then + width = maxWidth + padding; + else + width = maxWidth + 24; + end + tabText:SetWidth(width); + else + tabText:SetWidth(0); + end + if (minWidth and width < minWidth) then + width = minWidth; + end + tabWidth = width + sideWidths; + end + + if ( buttonMiddle ) then + buttonMiddle:SetWidth(width); + end + if ( buttonMiddleDisabled ) then + buttonMiddleDisabled:SetWidth(width); + end + + tab:SetWidth(tabWidth); + + if ( highlightTexture ) then + highlightTexture:SetWidth(tabWidth); + end +end + +local function PanelTemplates_DeselectTab(tab) + local name = tab:GetName(); + + local left = tab.Left or _G[name.."Left"]; + local middle = tab.Middle or _G[name.."Middle"]; + local right = tab.Right or _G[name.."Right"]; + left:Show(); + middle:Show(); + right:Show(); + --tab:UnlockHighlight(); + tab:Enable(); + local text = tab.Text or _G[name.."Text"]; + text:SetPoint("CENTER", tab, "CENTER", (tab.deselectedTextX or 0), (tab.deselectedTextY or 2)); + + local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"]; + local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"]; + local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"]; + leftDisabled:Hide(); + middleDisabled:Hide(); + rightDisabled:Hide(); +end + +local function PanelTemplates_SelectTab(tab) + local name = tab:GetName(); + + local left = tab.Left or _G[name.."Left"]; + local middle = tab.Middle or _G[name.."Middle"]; + local right = tab.Right or _G[name.."Right"]; + left:Hide(); + middle:Hide(); + right:Hide(); + --tab:LockHighlight(); + tab:Disable(); + tab:SetDisabledFontObject(GameFontHighlightSmall); + local text = tab.Text or _G[name.."Text"]; + text:SetPoint("CENTER", tab, "CENTER", (tab.selectedTextX or 0), (tab.selectedTextY or -3)); + + local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"]; + local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"]; + local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"]; + leftDisabled:Show(); + middleDisabled:Show(); + rightDisabled:Show(); + + if GameTooltip:IsOwned(tab) then + GameTooltip:Hide(); + end +end + +local function PanelTemplates_SetDisabledTabState(tab) + local name = tab:GetName(); + local left = tab.Left or _G[name.."Left"]; + local middle = tab.Middle or _G[name.."Middle"]; + local right = tab.Right or _G[name.."Right"]; + left:Show(); + middle:Show(); + right:Show(); + --tab:UnlockHighlight(); + tab:Disable(); + tab.text = tab:GetText(); + -- Gray out text + tab:SetDisabledFontObject(GameFontDisableSmall); + local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"]; + local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"]; + local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"]; + leftDisabled:Hide(); + middleDisabled:Hide(); + rightDisabled:Hide(); +end + local function UpdateTabLook(frame) if frame.disabled then PanelTemplates_SetDisabledTabState(frame) @@ -103,11 +236,64 @@ local methods = { ["CreateTab"] = function(self, id) local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id) - local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate") + local tab = CreateFrame("Button", tabname, self.border) + tab:SetSize(115, 24) + tab.deselectedTextY = -3 + tab.selectedTextY = -2 + + tab.LeftDisabled = tab:CreateTexture(tabname .. "LeftDisabled", "BORDER") + tab.LeftDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab") + tab.LeftDisabled:SetSize(20, 24) + tab.LeftDisabled:SetPoint("BOTTOMLEFT", 0, -3) + tab.LeftDisabled:SetTexCoord(0, 0.15625, 0, 1.0) + + tab.MiddleDisabled = tab:CreateTexture(tabname .. "MiddleDisabled", "BORDER") + tab.MiddleDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab") + tab.MiddleDisabled:SetSize(88, 24) + tab.MiddleDisabled:SetPoint("LEFT", tab.LeftDisabled, "RIGHT") + tab.MiddleDisabled:SetTexCoord(0.15625, 0.84375, 0, 1.0) + + tab.RightDisabled = tab:CreateTexture(tabname .. "RightDisabled", "BORDER") + tab.RightDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab") + tab.RightDisabled:SetSize(20, 24) + tab.RightDisabled:SetPoint("LEFT", tab.MiddleDisabled, "RIGHT") + tab.RightDisabled:SetTexCoord(0.84375, 1.0, 0, 1.0) + + tab.Left = tab:CreateTexture(tabname .. "Left", "BORDER") + tab.Left:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab") + tab.Left:SetSize(20, 24) + tab.Left:SetPoint("TOPLEFT") + tab.Left:SetTexCoord(0, 0.15625, 0, 1.0) + + tab.Middle = tab:CreateTexture(tabname .. "Middle", "BORDER") + tab.Middle:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab") + tab.Middle:SetSize(88, 24) + tab.Middle:SetPoint("LEFT", tab.Left, "RIGHT") + tab.Middle:SetTexCoord(0.15625, 0.84375, 0, 1.0) + + tab.Right = tab:CreateTexture(tabname .. "Right", "BORDER") + tab.Right:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab") + tab.Right:SetSize(20, 24) + tab.Right:SetPoint("LEFT", tab.Middle, "RIGHT") + tab.Right:SetTexCoord(0.84375, 1.0, 0, 1.0) + + tab.Text = tab:CreateFontString(tabname .. "Text") + tab:SetFontString(tab.Text) + + tab:SetNormalFontObject(GameFontNormalSmall) + tab:SetHighlightFontObject(GameFontHighlightSmall) + tab:SetDisabledFontObject(GameFontHighlightSmall) + tab:SetHighlightTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight", "ADD") + tab.HighlightTexture = tab:GetHighlightTexture() + tab.HighlightTexture:ClearAllPoints() + tab.HighlightTexture:SetPoint("LEFT", tab, "LEFT", 10, -4) + tab.HighlightTexture:SetPoint("RIGHT", tab, "RIGHT", -10, -4) + _G[tabname .. "HighlightTexture"] = tab.HighlightTexture + tab.obj = self tab.id = id - tab.text = _G[tabname .. "Text"] + tab.text = tab.Text -- compat tab.text:ClearAllPoints() tab.text:SetPoint("LEFT", 14, -3) tab.text:SetPoint("RIGHT", -12, -3) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua index 020061ec..89f387ae 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua @@ -2,22 +2,18 @@ TreeGroup Container Container that uses a tree control to switch between groups. -------------------------------------------------------------------------------]] -local Type, Version = "TreeGroup", 45 +local Type, Version = "TreeGroup", 47 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end -- Lua APIs local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type -local math_min, math_max, floor = math.min, math.max, floor +local math_min, math_max, floor = math.min, math.max, math.floor local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat -- WoW APIs local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: FONT_COLOR_CODE_CLOSE - -- Recycling functions local new, del do @@ -567,7 +563,11 @@ local methods = { if maxtreewidth > 100 and status.treewidth > maxtreewidth then self:SetTreeWidth(maxtreewidth, status.treesizable) end - treeframe:SetMaxResize(maxtreewidth, 1600) + if treeframe.SetResizeBounds then + treeframe:SetResizeBounds(100, 1, maxtreewidth, 1600) + else + treeframe:SetMaxResize(maxtreewidth, 1600) + end end, ["OnHeightSet"] = function(self, height) @@ -646,8 +646,12 @@ local function Constructor() treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5) treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4) treeframe:SetResizable(true) - treeframe:SetMinResize(100, 1) - treeframe:SetMaxResize(400, 1600) + if treeframe.SetResizeBounds then -- WoW 10.0 + treeframe:SetResizeBounds(100, 1, 400, 1600) + else + treeframe:SetMinResize(100, 1) + treeframe:SetMaxResize(400, 1600) + end treeframe:SetScript("OnUpdate", FirstFrameUpdate) treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged) treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua index 2e28a3dd..f378d93c 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua @@ -7,10 +7,6 @@ local pairs, assert, type = pairs, assert, type local PlaySound = PlaySound local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontNormal - ---------------- -- Main Frame -- ---------------- @@ -21,7 +17,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent ]] do local Type = "Window" - local Version = 6 + local Version = 8 local function frameOnShow(this) this.obj:Fire("OnShow") @@ -186,7 +182,11 @@ do frame:SetScript("OnShow",frameOnShow) frame:SetScript("OnHide",frameOnClose) - frame:SetMinResize(240,240) + if frame.SetResizeBounds then -- WoW 10.0 + frame:SetResizeBounds(240,240) + else + frame:SetMinResize(240,240) + end frame:SetToplevel(true) local titlebg = frame:CreateTexture(nil, "BACKGROUND") @@ -300,7 +300,7 @@ do line2:SetHeight(8) line2:SetPoint("BOTTOMRIGHT", -8, 8) line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - local x = 0.1 * 8/17 + x = 0.1 * 8/17 line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) local sizer_s = CreateFrame("Frame",nil,frame) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua index 53ef6180..fe17e039 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua @@ -12,10 +12,6 @@ local select, pairs = select, pairs local PlaySound = PlaySound local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: SetDesaturation, GameFontHighlight - --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] @@ -199,14 +195,14 @@ local methods = { ["SetDescription"] = function(self, desc) if desc then if not self.desc then - local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall") - desc:ClearAllPoints() - desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21) - desc:SetWidth(self.frame.width - 30) - desc:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0) - desc:SetJustifyH("LEFT") - desc:SetJustifyV("TOP") - self.desc = desc + local f = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall") + f:ClearAllPoints() + f:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21) + f:SetWidth(self.frame.width - 30) + f:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0) + f:SetJustifyH("LEFT") + f:SetJustifyV("TOP") + self.desc = f end self.desc:Show() --self.text:SetFontObject(GameFontNormal) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua index 11011629..d57b0087 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua @@ -11,10 +11,6 @@ local pairs = pairs -- WoW APIs local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: ColorPickerFrame, OpacitySliderFrame - --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua index 7ae1401f..947184c2 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua @@ -1,4 +1,4 @@ ---[[ $Id: AceGUIWidget-DropDown-Items.lua 1202 2019-05-15 23:11:22Z nevcairiel $ ]]-- +--[[ $Id: AceGUIWidget-DropDown-Items.lua 1272 2022-08-29 15:56:35Z nevcairiel $ ]]-- local AceGUI = LibStub("AceGUI-3.0") @@ -41,7 +41,7 @@ local ItemBase = { -- NOTE: The ItemBase version is added to each item's version number -- to ensure proper updates on ItemBase changes. -- Use at least 1000er steps. - version = 1000, + version = 2000, counter = 0, } @@ -178,7 +178,7 @@ function ItemBase.Create(type) highlight:Hide() self.highlight = highlight - local check = frame:CreateTexture("OVERLAY") + local check = frame:CreateTexture(nil, "OVERLAY") check:SetWidth(16) check:SetHeight(16) check:SetPoint("LEFT",frame,"LEFT",3,-1) @@ -186,7 +186,7 @@ function ItemBase.Create(type) check:Hide() self.check = check - local sub = frame:CreateTexture("OVERLAY") + local sub = frame:CreateTexture(nil, "OVERLAY") sub:SetWidth(16) sub:SetHeight(16) sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua index 9abf35ef..59c7f53b 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua @@ -1,4 +1,4 @@ ---[[ $Id: AceGUIWidget-DropDown.lua 1262 2022-04-07 23:00:32Z funkehdude $ ]]-- +--[[ $Id: AceGUIWidget-DropDown.lua 1284 2022-09-25 09:15:30Z nevcairiel $ ]]-- local AceGUI = LibStub("AceGUI-3.0") -- Lua APIs @@ -11,10 +11,6 @@ local PlaySound = PlaySound local UIParent, CreateFrame = UIParent, CreateFrame local _G = _G --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: CLOSE - local function fixlevels(parent,...) local i = 1 local child = select(i, ...) diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua index 29f7e00e..bb1e4fdf 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua @@ -14,10 +14,6 @@ local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, Get local CreateFrame, UIParent = CreateFrame, UIParent local _G = _G --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY - --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua index b3cd012e..0c779dc5 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua @@ -13,10 +13,6 @@ local pairs = pairs local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: NOT_BOUND - --[[----------------------------------------------------------------------------- Scripts -------------------------------------------------------------------------------]] diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua index e58494dd..d0841efe 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua @@ -12,10 +12,6 @@ local max, select, pairs = math.max, select, pairs -- WoW APIs local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontHighlightSmall - --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua index e37b4260..bacb2be8 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua @@ -1,4 +1,4 @@ -local Type, Version = "MultiLineEditBox", 29 +local Type, Version = "MultiLineEditBox", 32 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -10,10 +10,6 @@ local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, Cl local CreateFrame, UIParent = CreateFrame, UIParent local _G = _G --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: ACCEPT, ChatFontNormal - --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] @@ -145,6 +141,14 @@ local function OnVerticalScroll(self, offset) editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight()) end +local function OnScrollRangeChanged(self, xrange, yrange) + if yrange == 0 then + self.obj.editBox:SetHitRectInsets(0, 0, 0, 0) + else + OnVerticalScroll(self, self:GetVerticalScroll()) + end +end + local function OnShowFocus(frame) frame.obj.editBox:SetFocus() frame:SetScript("OnShow", nil) @@ -257,8 +261,6 @@ local methods = { ["SetCursorPosition"] = function(self, ...) return self.editBox:SetCursorPosition(...) end, - - } --[[----------------------------------------------------------------------------- @@ -321,6 +323,7 @@ local function Constructor() scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag) scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll) + scrollFrame:HookScript("OnScrollRangeChanged", OnScrollRangeChanged) local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame) editBox:SetAllPoints() diff --git a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua index 2567ab50..483d400d 100644 --- a/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua +++ b/AtlasLootClassic_Options/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua @@ -14,10 +14,6 @@ local tonumber, pairs = tonumber, pairs local PlaySound = PlaySound local CreateFrame, UIParent = CreateFrame, UIParent --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontHighlightSmall - --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] @@ -31,13 +27,13 @@ local function UpdateText(self) end local function UpdateLabels(self) - local min, max = (self.min or 0), (self.max or 100) + local min_value, max_value = (self.min or 0), (self.max or 100) if self.ispercent then - self.lowtext:SetFormattedText("%s%%", (min * 100)) - self.hightext:SetFormattedText("%s%%", (max * 100)) + self.lowtext:SetFormattedText("%s%%", (min_value * 100)) + self.hightext:SetFormattedText("%s%%", (max_value * 100)) else - self.lowtext:SetText(min) - self.hightext:SetText(max) + self.lowtext:SetText(min_value) + self.hightext:SetText(max_value) end end @@ -175,13 +171,13 @@ local methods = { self.label:SetText(text) end, - ["SetSliderValues"] = function(self, min, max, step) + ["SetSliderValues"] = function(self, min_value, max_value, step) local frame = self.slider frame.setup = true - self.min = min - self.max = max + self.min = min_value + self.max = max_value self.step = step - frame:SetMinMaxValues(min or 0,max or 100) + frame:SetMinMaxValues(min_value or 0,max_value or 100) UpdateLabels(self) frame:SetValueStep(step or 1) if self.value then diff --git a/AtlasLootClassic_PvP/AtlasLootClassic_PvP.toc b/AtlasLootClassic_PvP/AtlasLootClassic_PvP.toc index a6be1e45..27f6b9e7 100644 --- a/AtlasLootClassic_PvP/AtlasLootClassic_PvP.toc +++ b/AtlasLootClassic_PvP/AtlasLootClassic_PvP.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic diff --git a/AtlasLootClassic_PvP/AtlasLootClassic_PvP_Wrath.toc b/AtlasLootClassic_PvP/AtlasLootClassic_PvP_Wrath.toc index a6be1e45..27f6b9e7 100644 --- a/AtlasLootClassic_PvP/AtlasLootClassic_PvP_Wrath.toc +++ b/AtlasLootClassic_PvP/AtlasLootClassic_PvP_Wrath.toc @@ -1,4 +1,4 @@ -## Interface: 30400 +## Interface: 30401 ## Author: Lag ## Version: @project-version@ ## Dependencies: AtlasLootClassic From a07bb697faad3398582490545fa5f38ce09d5942 Mon Sep 17 00:00:00 2001 From: Krullgor Date: Sat, 14 Jan 2023 11:13:39 +0100 Subject: [PATCH 2/5] adjust t8 set itemlvl averages --- AtlasLootClassic/Data/ItemSet.lua | 114 +++++++++++++++--------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/AtlasLootClassic/Data/ItemSet.lua b/AtlasLootClassic/Data/ItemSet.lua index 1c19b40d..af00adfb 100644 --- a/AtlasLootClassic/Data/ItemSet.lua +++ b/AtlasLootClassic/Data/ItemSet.lua @@ -532,25 +532,25 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.WRATH_VERSION_NUM) then [817] = {{43455,43457,43453,43452,43454,43450,43456,43451},3,3,187,32767,{{4,63973},{6,63972}}}, -- Stormhide Battlegear [818] = {{43447,43449,43445,43444,43446,43442,43448,43443},3,3,187,32767,{{4,63973},{6,63972}}}, -- Swiftarrow Battlegear [819] = {{43971,43973,43972,43974,41516,43969,43975,43970},1,3,187,0,{{4,63973},{6,63972}}}, -- Frostsavage Battlegear - [820] = {{46221,46226,46213,46216,46224},4,4,219,2,{{2,64878},{4,64879}}}, -- Aegis Battlegear - [821] = {{46215,46225,46214,46219,46222},4,4,219,2,{{2,64881},{4,64882}}}, -- Aegis Plate - [822] = {{46220,46227,46228,46217,46218},4,4,219,2,{{2,64890},{4,64895}}}, -- Aegis Regalia - [823] = {{46294,46303,46293,46296,46307},3,4,219,64,{{2,64916},{4,64917}}}, -- Worldbreaker Battlegear - [824] = {{46300,46304,46298,46295,46301},3,4,219,64,{{2,64925},{4,64928}}}, -- Worldbreaker Garb - [825] = {{46299,46305,46306,46297,46302},3,4,219,64,{{2,64921},{4,64922}}}, -- Worldbreaker Regalia - [826] = {{46290,46292,46288,46289,46291},2,4,219,8,{{2,64914},{4,64915}}}, -- Terrorblade Battlegear - [827] = {{46262,46269,46267,46260,46265},2,4,219,1024,{{2,64752},{4,64754}}}, -- Nightsong Battlegear - [828] = {{45350,46266,46272,46309,46271},2,4,219,1024,{{2,64818},{4,64824}}}, -- Nightsong Garb - [829] = {{46263,46270,46268,46261,46264},2,4,219,1024,{{2,64756},{4,64760}}}, -- Nightsong Regalia - [830] = {{46282,46287,46278,46280,46285},4,4,219,1,{{2,64938},{4,64939}}}, -- Siegebreaker Battlegear - [831] = {{46281,46286,46279,46283,46284},4,4,219,1,{{2,64933},{4,64936}}}, -- Siegebreaker Plate - [832] = {{46230,46255,46257,46248,46256},1,4,219,16,{{2,64906},{4,64908}}}, -- Sanctification Garb - [833] = {{46231,46259,46258,46247,46254},1,4,219,16,{{2,64910},{4,64912}}}, -- Sanctification Regalia - [834] = {{46237,46241,46232,46235,46239},4,4,219,32,{{2,64735},{4,64736}}}, -- Darkruned Battlegear - [835] = {{46234,46240,46233,46236,46238},4,4,219,32,{{2,64744},{4,64745}}}, -- Darkruned Plate - [836] = {{46250,46252,46253,46249,46251},1,4,219,128,{{2,64867},{4,64869}}}, -- Kirin Tor Garb - [837] = {{46243,46246,46245,46242,46244},1,4,219,256,{{2,64931},{4,64932}}}, -- Deathbringer Garb - [838] = {{46274,46276,46277,46273,46275},3,4,219,4,{{2,64854},{4,64860}}}, -- Scourgestalker Battlegear + [820] = {{46221,46226,46213,46216,46224},4,4,225,2,{{2,64878},{4,64879}}}, -- Aegis Battlegear + [821] = {{46215,46225,46214,46219,46222},4,4,225,2,{{2,64881},{4,64882}}}, -- Aegis Plate + [822] = {{46220,46227,46228,46217,46218},4,4,225,2,{{2,64890},{4,64895}}}, -- Aegis Regalia + [823] = {{46294,46303,46293,46296,46307},3,4,225,64,{{2,64916},{4,64917}}}, -- Worldbreaker Battlegear + [824] = {{46300,46304,46298,46295,46301},3,4,225,64,{{2,64925},{4,64928}}}, -- Worldbreaker Garb + [825] = {{46299,46305,46306,46297,46302},3,4,225,64,{{2,64921},{4,64922}}}, -- Worldbreaker Regalia + [826] = {{46290,46292,46288,46289,46291},2,4,225,8,{{2,64914},{4,64915}}}, -- Terrorblade Battlegear + [827] = {{46262,46269,46267,46260,46265},2,4,225,1024,{{2,64752},{4,64754}}}, -- Nightsong Battlegear + [828] = {{45350,46266,46272,46309,46271},2,4,225,1024,{{2,64818},{4,64824}}}, -- Nightsong Garb + [829] = {{46263,46270,46268,46261,46264},2,4,225,1024,{{2,64756},{4,64760}}}, -- Nightsong Regalia + [830] = {{46282,46287,46278,46280,46285},4,4,225,1,{{2,64938},{4,64939}}}, -- Siegebreaker Battlegear + [831] = {{46281,46286,46279,46283,46284},4,4,225,1,{{2,64933},{4,64936}}}, -- Siegebreaker Plate + [832] = {{46230,46255,46257,46248,46256},1,4,225,16,{{2,64906},{4,64908}}}, -- Sanctification Garb + [833] = {{46231,46259,46258,46247,46254},1,4,225,16,{{2,64910},{4,64912}}}, -- Sanctification Regalia + [834] = {{46237,46241,46232,46235,46239},4,4,225,32,{{2,64735},{4,64736}}}, -- Darkruned Battlegear + [835] = {{46234,46240,46233,46236,46238},4,4,225,32,{{2,64744},{4,64745}}}, -- Darkruned Plate + [836] = {{46250,46252,46253,46249,46251},1,4,225,128,{{2,64867},{4,64869}}}, -- Kirin Tor Garb + [837] = {{46243,46246,46245,46242,46244},1,4,225,256,{{2,64931},{4,64932}}}, -- Deathbringer Garb + [838] = {{46274,46276,46277,46273,46275},3,4,225,4,{{2,64854},{4,64860}}}, -- Scourgestalker Battlegear [843] = {{48726,48729,48728,48725,48727},1,4,232,128,{{2,67164},{4,67185}}}, -- Khadgar's Regalia [844] = {{48731,48734,48733,48730,48732},1,4,232,128,{{2,67164},{4,67185}}}, -- Sunstrider's Regalia [845] = {{48736,48739,48738,48735,48737},1,4,232,256,{{2,67230},{4,67231}}}, -- Gul'dan's Regalia @@ -734,25 +734,25 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.WRATH_VERSION_NUM) then [3100803] = {{39491,39494,39492,39495,39493},1,4,200,128,{{2,61062},{4,60146}},AL["Heroes' %s"],803}, -- Heroes' Frostfire Garb [3100804] = {{39514,39518,39515,39519,39517},1,4,200,16,{{2,60154},{4,60155}},AL["Heroes' %s"],804}, -- Heroes' Regalia of Faith [3100805] = {{39521,39529,39523,39530,39528},1,4,200,16,{{2,60156},{4,60157}},AL["Heroes' %s"],805}, -- Heroes' Garb of Faith - [3100820] = {{45377,45380,45375,45376,45379},4,4,219,2,{{2,64878},{4,64879}},AL["Valorous %s"],820}, -- Valorous Aegis Battlegear - [3100821] = {{45382,45385,45381,45383,45384},4,4,219,2,{{2,64881},{4,64882}},AL["Valorous %s"],821}, -- Valorous Aegis Plate - [3100822] = {{45372,45373,45374,45370,45371},4,4,219,2,{{2,64890},{4,64895}},AL["Valorous %s"],822}, -- Valorous Aegis Regalia - [3100823] = {{45412,45415,45413,45414,45416},3,4,219,64,{{2,64916},{4,64917}},AL["Valorous %s"],823}, -- Valorous Worldbreaker Battlegear - [3100824] = {{45408,45410,45411,45406,45409},3,4,219,64,{{2,64925},{4,64928}},AL["Valorous %s"],824}, -- Valorous Worldbreaker Garb - [3100825] = {{45402,45404,45405,45401,45403},3,4,219,64,{{2,64921},{4,64922}},AL["Valorous %s"],825}, -- Valorous Worldbreaker Regalia - [3100826] = {{45398,45400,45396,45397,45399},2,4,219,8,{{2,64914},{4,64915}},AL["Valorous %s"],826}, -- Valorous Terrorblade Battlegear - [3100827] = {{45356,45359,45358,45355,45357},2,4,219,1024,{{2,64752},{4,64754}},AL["Valorous %s"],827}, -- Valorous Nightsong Battlegear - [3100828] = {{46313,45352,45354,45351,45353},2,4,219,1024,{{2,64818},{4,64824}},AL["Valorous %s"],828}, -- Valorous Nightsong Garb - [3100829] = {{45346,45349,45348,45345,45347},2,4,219,1024,{{2,64756},{4,64760}},AL["Valorous %s"],829}, -- Valorous Nightsong Regalia - [3100830] = {{45431,45433,45429,45430,45432},4,4,219,1,{{2,64938},{4,64939}},AL["Valorous %s"],830}, -- Valorous Siegebreaker Battlegear - [3100831] = {{45425,45428,45424,45426,45427},4,4,219,1,{{2,64933},{4,64936}},AL["Valorous %s"],831}, -- Valorous Siegebreaker Plate - [3100832] = {{45391,45393,45395,45392,45394},1,4,219,16,{{2,64906},{4,64908}},AL["Valorous %s"],832}, -- Valorous Sanctification Garb - [3100833] = {{45386,45390,45389,45387,45388},1,4,219,16,{{2,64910},{4,64912}},AL["Valorous %s"],833}, -- Valorous Sanctification Regalia - [3100834] = {{45342,45344,45340,45341,45343},4,4,219,32,{{2,64735},{4,64736}},AL["Valorous %s"],834}, -- Valorous Darkruned Battlegear - [3100835] = {{45336,45339,45335,45337,45338},4,4,219,32,{{2,64744},{4,64745}},AL["Valorous %s"],835}, -- Valorous Darkruned Plate - [3100836] = {{45365,45369,45368,46131,45367},1,4,219,128,{{2,64867},{4,64869}},AL["Valorous %s"],836}, -- Valorous Kirin Tor Garb - [3100837] = {{45417,45422,45421,45419,45420},1,4,219,256,{{2,64931},{4,64932}},AL["Valorous %s"],837}, -- Valorous Deathbringer Garb - [3100838] = {{45361,45363,45364,45360,45362},3,4,219,4,{{2,64854},{4,64860}},AL["Valorous %s"],838}, -- Valorous Scourgestalker Battlegear + [3100820] = {{45377,45380,45375,45376,45379},4,4,225,2,{{2,64878},{4,64879}},AL["Valorous %s"],820}, -- Valorous Aegis Battlegear + [3100821] = {{45382,45385,45381,45383,45384},4,4,225,2,{{2,64881},{4,64882}},AL["Valorous %s"],821}, -- Valorous Aegis Plate + [3100822] = {{45372,45373,45374,45370,45371},4,4,225,2,{{2,64890},{4,64895}},AL["Valorous %s"],822}, -- Valorous Aegis Regalia + [3100823] = {{45412,45415,45413,45414,45416},3,4,225,64,{{2,64916},{4,64917}},AL["Valorous %s"],823}, -- Valorous Worldbreaker Battlegear + [3100824] = {{45408,45410,45411,45406,45409},3,4,225,64,{{2,64925},{4,64928}},AL["Valorous %s"],824}, -- Valorous Worldbreaker Garb + [3100825] = {{45402,45404,45405,45401,45403},3,4,225,64,{{2,64921},{4,64922}},AL["Valorous %s"],825}, -- Valorous Worldbreaker Regalia + [3100826] = {{45398,45400,45396,45397,45399},2,4,225,8,{{2,64914},{4,64915}},AL["Valorous %s"],826}, -- Valorous Terrorblade Battlegear + [3100827] = {{45356,45359,45358,45355,45357},2,4,225,1024,{{2,64752},{4,64754}},AL["Valorous %s"],827}, -- Valorous Nightsong Battlegear + [3100828] = {{46313,45352,45354,45351,45353},2,4,225,1024,{{2,64818},{4,64824}},AL["Valorous %s"],828}, -- Valorous Nightsong Garb + [3100829] = {{45346,45349,45348,45345,45347},2,4,225,1024,{{2,64756},{4,64760}},AL["Valorous %s"],829}, -- Valorous Nightsong Regalia + [3100830] = {{45431,45433,45429,45430,45432},4,4,225,1,{{2,64938},{4,64939}},AL["Valorous %s"],830}, -- Valorous Siegebreaker Battlegear + [3100831] = {{45425,45428,45424,45426,45427},4,4,225,1,{{2,64933},{4,64936}},AL["Valorous %s"],831}, -- Valorous Siegebreaker Plate + [3100832] = {{45391,45393,45395,45392,45394},1,4,225,16,{{2,64906},{4,64908}},AL["Valorous %s"],832}, -- Valorous Sanctification Garb + [3100833] = {{45386,45390,45389,45387,45388},1,4,225,16,{{2,64910},{4,64912}},AL["Valorous %s"],833}, -- Valorous Sanctification Regalia + [3100834] = {{45342,45344,45340,45341,45343},4,4,225,32,{{2,64735},{4,64736}},AL["Valorous %s"],834}, -- Valorous Darkruned Battlegear + [3100835] = {{45336,45339,45335,45337,45338},4,4,225,32,{{2,64744},{4,64745}},AL["Valorous %s"],835}, -- Valorous Darkruned Plate + [3100836] = {{45365,45369,45368,46131,45367},1,4,225,128,{{2,64867},{4,64869}},AL["Valorous %s"],836}, -- Valorous Kirin Tor Garb + [3100837] = {{45417,45422,45421,45419,45420},1,4,225,256,{{2,64931},{4,64932}},AL["Valorous %s"],837}, -- Valorous Deathbringer Garb + [3100838] = {{45361,45363,45364,45360,45362},3,4,225,4,{{2,64854},{4,64860}},AL["Valorous %s"],838}, -- Valorous Scourgestalker Battlegear [3250787] = {{40546,40548,40544,40545,40547},4,4,213,1,{{2,60173},{4,60175}},AL["Valorous %s"],787}, -- Valorous Dreadnaught Plate [3250788] = {{40528,40530,40525,40527,40529},4,4,213,1,{{2,60174},{4,60176}},AL["Valorous %s"],788}, -- Valorous Dreadnaught Battlegear [3250789] = {{40576,40578,40574,40575,40577},4,4,213,2,{{2,60152},{4,60153}},AL["Valorous %s"],789}, -- Valorous Redemption Battlegear @@ -772,25 +772,25 @@ if AtlasLoot:GameVersion_GE(AtlasLoot.WRATH_VERSION_NUM) then [3250803] = {{40416,40419,40418,40415,40417},1,4,213,128,{{2,61062},{4,60146}},AL["Valorous %s"],803}, -- Valorous Frostfire Garb [3250804] = {{40447,40450,40449,40445,40448},1,4,213,16,{{2,60154},{4,60155}},AL["Valorous %s"],804}, -- Valorous Regalia of Faith [3250805] = {{40456,40459,40458,40454,40457},1,4,213,16,{{2,60156},{4,60157}},AL["Valorous %s"],805}, -- Valorous Garb of Faith - [3250820] = {{46156,46152,46154,46155,46153},4,4,226,2,{{2,64878},{4,64879}},AL["Conqueror's %s"],820}, -- Conqueror's Aegis Battlegear - [3250821] = {{46175,46177,46173,46174,46176},4,4,226,2,{{2,64881},{4,64882}},AL["Conqueror's %s"],821}, -- Conqueror's Aegis Plate - [3250822] = {{46180,46182,46178,46179,46181},4,4,226,2,{{2,64890},{4,64895}},AL["Conqueror's %s"],822}, -- Conqueror's Aegis Regalia - [3250823] = {{46212,46203,46205,46200,46208},3,4,226,64,{{2,64916},{4,64917}},AL["Conqueror's %s"],823}, -- Conqueror's Worldbreaker Battlegear - [3250824] = {{46209,46211,46206,46207,46210},3,4,226,64,{{2,64925},{4,64928}},AL["Conqueror's %s"],824}, -- Conqueror's Worldbreaker Garb - [3250825] = {{46201,46204,46198,46199,46202},3,4,226,64,{{2,64921},{4,64922}},AL["Conqueror's %s"],825}, -- Conqueror's Worldbreaker Regalia - [3250826] = {{46125,46127,46123,46124,46126},2,4,226,8,{{2,64914},{4,64915}},AL["Conqueror's %s"],826}, -- Conqueror's Terrorblade Battlegear - [3250827] = {{46161,46157,46159,46158,46160},2,4,226,1024,{{2,64752},{4,64754}},AL["Conqueror's %s"],827}, -- Conqueror's Nightsong Battlegear - [3250828] = {{46191,46196,46194,46189,46192},2,4,226,1024,{{2,64818},{4,64824}},AL["Conqueror's %s"],828}, -- Conqueror's Nightsong Garb - [3250829] = {{46184,46187,46186,46183,46185},2,4,226,1024,{{2,64756},{4,64760}},AL["Conqueror's %s"],829}, -- Conqueror's Nightsong Regalia - [3250830] = {{46151,46149,46146,46148,46150},4,4,226,1,{{2,64938},{4,64939}},AL["Conqueror's %s"],830}, -- Conqueror's Siegebreaker Battlegear - [3250831] = {{46166,46167,46162,46164,46169},4,4,226,1,{{2,64933},{4,64936}},AL["Conqueror's %s"],831}, -- Conqueror's Siegebreaker Plate - [3250832] = {{46172,46165,46168,46163,46170},1,4,226,16,{{2,64906},{4,64908}},AL["Conqueror's %s"],832}, -- Conqueror's Sanctification Garb - [3250833] = {{46197,46190,46193,46188,46195},1,4,226,16,{{2,64910},{4,64912}},AL["Conqueror's %s"],833}, -- Conqueror's Sanctification Regalia - [3250834] = {{46115,46117,46111,46113,46116},4,4,226,32,{{2,64735},{4,64736}},AL["Conqueror's %s"],834}, -- Conqueror's Darkruned Battlegear - [3250835] = {{46120,46122,46118,46119,46121},4,4,226,32,{{2,64744},{4,64745}},AL["Conqueror's %s"],835}, -- Conqueror's Darkruned Plate - [3250836] = {{46129,46134,46130,46132,46133},1,4,226,128,{{2,64867},{4,64869}},AL["Conqueror's %s"],836}, -- Conqueror's Kirin Tor Garb - [3250837] = {{46140,46136,46137,46135,46139},1,4,226,256,{{2,64931},{4,64932}},AL["Conqueror's %s"],837}, -- Conqueror's Deathbringer Garb - [3250838] = {{46143,46145,46141,46142,46144},3,4,226,4,{{2,64854},{4,64860}},AL["Conqueror's %s"],838}, -- Conqueror's Scourgestalker Battlegear + [3250820] = {{46156,46152,46154,46155,46153},4,4,232,2,{{2,64878},{4,64879}},AL["Conqueror's %s"],820}, -- Conqueror's Aegis Battlegear + [3250821] = {{46175,46177,46173,46174,46176},4,4,232,2,{{2,64881},{4,64882}},AL["Conqueror's %s"],821}, -- Conqueror's Aegis Plate + [3250822] = {{46180,46182,46178,46179,46181},4,4,232,2,{{2,64890},{4,64895}},AL["Conqueror's %s"],822}, -- Conqueror's Aegis Regalia + [3250823] = {{46212,46203,46205,46200,46208},3,4,232,64,{{2,64916},{4,64917}},AL["Conqueror's %s"],823}, -- Conqueror's Worldbreaker Battlegear + [3250824] = {{46209,46211,46206,46207,46210},3,4,232,64,{{2,64925},{4,64928}},AL["Conqueror's %s"],824}, -- Conqueror's Worldbreaker Garb + [3250825] = {{46201,46204,46198,46199,46202},3,4,232,64,{{2,64921},{4,64922}},AL["Conqueror's %s"],825}, -- Conqueror's Worldbreaker Regalia + [3250826] = {{46125,46127,46123,46124,46126},2,4,232,8,{{2,64914},{4,64915}},AL["Conqueror's %s"],826}, -- Conqueror's Terrorblade Battlegear + [3250827] = {{46161,46157,46159,46158,46160},2,4,232,1024,{{2,64752},{4,64754}},AL["Conqueror's %s"],827}, -- Conqueror's Nightsong Battlegear + [3250828] = {{46191,46196,46194,46189,46192},2,4,232,1024,{{2,64818},{4,64824}},AL["Conqueror's %s"],828}, -- Conqueror's Nightsong Garb + [3250829] = {{46184,46187,46186,46183,46185},2,4,232,1024,{{2,64756},{4,64760}},AL["Conqueror's %s"],829}, -- Conqueror's Nightsong Regalia + [3250830] = {{46151,46149,46146,46148,46150},4,4,232,1,{{2,64938},{4,64939}},AL["Conqueror's %s"],830}, -- Conqueror's Siegebreaker Battlegear + [3250831] = {{46166,46167,46162,46164,46169},4,4,232,1,{{2,64933},{4,64936}},AL["Conqueror's %s"],831}, -- Conqueror's Siegebreaker Plate + [3250832] = {{46172,46165,46168,46163,46170},1,4,232,16,{{2,64906},{4,64908}},AL["Conqueror's %s"],832}, -- Conqueror's Sanctification Garb + [3250833] = {{46197,46190,46193,46188,46195},1,4,232,16,{{2,64910},{4,64912}},AL["Conqueror's %s"],833}, -- Conqueror's Sanctification Regalia + [3250834] = {{46115,46117,46111,46113,46116},4,4,232,32,{{2,64735},{4,64736}},AL["Conqueror's %s"],834}, -- Conqueror's Darkruned Battlegear + [3250835] = {{46120,46122,46118,46119,46121},4,4,232,32,{{2,64744},{4,64745}},AL["Conqueror's %s"],835}, -- Conqueror's Darkruned Plate + [3250836] = {{46129,46134,46130,46132,46133},1,4,232,128,{{2,64867},{4,64869}},AL["Conqueror's %s"],836}, -- Conqueror's Kirin Tor Garb + [3250837] = {{46140,46136,46137,46135,46139},1,4,232,256,{{2,64931},{4,64932}},AL["Conqueror's %s"],837}, -- Conqueror's Deathbringer Garb + [3250838] = {{46143,46145,46141,46142,46144},3,4,232,4,{{2,64854},{4,64860}},AL["Conqueror's %s"],838}, -- Conqueror's Scourgestalker Battlegear [3250843] = {{47754,47757,47756,47753,47755},1,4,245,128,{{2,67164},{4,67185}},AL["Triumphant %s"],843}, -- Triumphant Khadgar's Regalia [3250844] = {{47771,47768,47769,47772,47770},1,4,245,128,{{2,67164},{4,67185}},AL["Triumphant %s"],844}, -- Triumphant Sunstrider's Regalia [3250845] = {{47804,47807,47806,47803,47805},1,4,245,256,{{2,67230},{4,67231}},AL["Triumphant %s"],845}, -- Triumphant Gul'dan's Regalia From e441c2585ccd6ec089f26c87265c82d6065e10ae Mon Sep 17 00:00:00 2001 From: Krullgor Date: Sat, 14 Jan 2023 11:35:41 +0100 Subject: [PATCH 3/5] add titan rune loot for telestra confirmed by https://us.forums.blizzard.com/en/wow/t/feedback-titan-rune-dungeons/1411003/19 --- AtlasLootClassic_Data/source-wrath.lua | 6 +++--- AtlasLootClassic_DungeonsAndRaids/data-wrath.lua | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/AtlasLootClassic_Data/source-wrath.lua b/AtlasLootClassic_Data/source-wrath.lua index 19c47cf8..83720484 100644 --- a/AtlasLootClassic_Data/source-wrath.lua +++ b/AtlasLootClassic_Data/source-wrath.lua @@ -1245,16 +1245,16 @@ local SOURCE_DATA = { [39369] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, [39379] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, [39386] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39388] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, +[39388] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3},{[1] = 8,[2] = 2,[3] = 1,[5] = 2}}, [39389] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, [39390] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, [39391] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, [39392] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39393] = {[1] = 17,[2] = 9,[3] = 1,[5] = 3}, +[39393] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 8,[2] = 2,[3] = 1,[5] = 2}}, [39394] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, [39395] = {[1] = 17,[2] = 9,[3] = 1,[5] = 3}, [39396] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39397] = {[1] = 17,[2] = 9,[3] = 1,[5] = 3}, +[39397] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 8,[2] = 2,[3] = 1,[5] = 2}}, [39398] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, [39399] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, [39401] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, diff --git a/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua b/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua index 52df9430..53935c78 100644 --- a/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua +++ b/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua @@ -1475,6 +1475,10 @@ data["TheNexus"] = { { 6, 37134 }, -- Telestra's Journal { 16, 21524 }, -- Red Winter Hat { 18, "ac2150" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39397 }, -- Pauldrons of Havoc + { 29, 39393 }, -- Claymore of Ancient Power + { 30, 39388 }, -- Spirit-World Glass } }, { -- TheNexusAnomalus / 7 From 83b38bca5847db7a773a1e533da3918868a3a7b6 Mon Sep 17 00:00:00 2001 From: Krullgor Date: Tue, 17 Jan 2023 17:10:30 +0100 Subject: [PATCH 4/5] add known titan rune loot for heroic bosses, source: https://docs.google.com/spreadsheets/d/1Nb2MaGSq1RCy7Ha5E69J0OUSWNFer4wn1-SSTq56fx4/edit#gid=0 --- .../data-wrath.lua | 549 ++++++++---------- 1 file changed, 252 insertions(+), 297 deletions(-) diff --git a/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua b/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua index 53935c78..e4e7088a 100644 --- a/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua +++ b/AtlasLootClassic_DungeonsAndRaids/data-wrath.lua @@ -587,6 +587,10 @@ data["AhnKahet"] = { { 5, 37592 }, -- Brood Plague Helmet { 6, 37591 }, -- Nerubian Shield Ring { 16, "ac2038" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39255 }, -- Staff of the Plague Beast + { 29, 39249 }, -- Shoulderplates of Bloodshed + --{ 30, xxx }, -- xxx } }, { -- AhnkahetTaldaram / 16 @@ -607,6 +611,10 @@ data["AhnKahet"] = { { 4, 37614 }, -- Gauntlets of the Plundering Geist { 5, 37612 }, -- Bonegrinder Breastplate { 6, 37595 }, -- Necklace of Taldaram + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39251 }, -- Necrogenic Belt + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- AhnkahetAmanitarHEROIC / 17 @@ -622,6 +630,10 @@ data["AhnKahet"] = { { 4, 43286 }, -- Legguards of Swarming Attacks { 5, 43285 }, -- Amulet of the Spell Flinger { 6, 43284 }, -- Amanitar Skullbow + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39251 }, -- Necrogenic Belt + { 29, 39260 }, -- Helm of the Corrupted Mind + --{ 30, xxx }, -- xxx } }, { -- AhnkahetJedoga / 18 @@ -645,6 +657,10 @@ data["AhnKahet"] = { { 6, 43281 }, -- Edge of Oblivion { 16, 21524 }, -- Red Winter Hat { 18, "ac2056" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39258 }, -- Legplates of Inescapable Death + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- AhnkahetVolazj / 19 @@ -672,6 +688,10 @@ data["AhnKahet"] = { { 16, 43102 }, -- Frozen Orb { 18, 41790 }, -- Design: Precise Scarlet Ruby { 20, "ac1862" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39417 }, -- Death's Bite + { 29, 43998 }, -- Chestguard of Flagrant Prowess + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -723,6 +743,10 @@ data["AzjolNerub"] = { { 5, 37217 }, -- Golden Limb Bands { 6, 37216 }, -- Facade Shield of Glyphs { 16, "ac1296" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39257 }, -- Loatheb's Shadow + { 29, 39259 }, -- Fungi-Stained Coverings + --{ 30, xxx }, -- xxx } }, { -- AzjolNerubHadronox / 12 @@ -744,6 +768,10 @@ data["AzjolNerub"] = { { 5, 37221 }, -- Hollowed Mandible Legplates { 6, 37220 }, -- Essence of Gossamer { 16, "ac1297" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39252 }, -- Preceptor's Bindings + { 29, 39261 }, -- Tainted Girdle of Mending + --{ 30, xxx }, -- xxx } }, { -- AzjolNerubAnubarak / 13 @@ -772,6 +800,10 @@ data["AzjolNerub"] = { { 16, 43102 }, -- Frozen Orb { 18, 41796 }, -- Design: Infused Twilight Opal { 20, "ac1860" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39419 }, -- Nerubian Conquerer + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -819,6 +851,10 @@ data["DrakTharonKeep"] = { { 5, 37717 }, -- Legs of Physical Regeneration { 6, 37712 }, -- Terrace Defence Boots { 16, "ac2151" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39241 }, -- Dark Shroud of the Scourge + { 29, 39242 }, -- Robes of Hoarse Breaths + --{ 30, xxx }, -- xxx } }, { -- DrakTharonKeepNovos / 22 @@ -838,6 +874,10 @@ data["DrakTharonKeep"] = { { 4, 37718 }, -- Temple Crystal Fragment { 5, 37721 }, -- Cursed Lich Blade { 16, "ac2057" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39237 }, -- Spaulders of Resumed Battle + { 29, 39244 }, -- Ring of the Fated + { 30, 39236 }, -- Trespasser's Boots } }, { -- DrakTharonKeepKingDred / 23 @@ -859,6 +899,10 @@ data["DrakTharonKeep"] = { { 5, 37726 }, -- King Dred's Helm { 6, 37723 }, -- Incisor Fragment { 16, "ac2039" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39243 }, -- Handgrips of the Foredoomed + { 29, 39239 }, -- Chestplate of the Risen Soldier + { 30, 39240 }, -- Noth's Curse } }, { -- DrakTharonKeepTharonja / 24 @@ -886,6 +930,10 @@ data["DrakTharonKeep"] = { { 16, 43102 }, -- Frozen Orb { 18, 41795 }, -- Design: Timeless Forest Emerald { 20, "ac1658" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 43995 }, -- Enamored Cowl + { 29, 39416 }, -- Kel'Thuzad's Reach + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -938,6 +986,10 @@ data["Gundrak"] = { { 5, 37627 }, -- Snake Den Spaulders { 6, 37626 }, -- Wand of Sseratus { 16, "ac2058" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39229 }, -- Embrace of the Spider + { 29, 39230 }, -- Spaulders of the Monstrosity + { 30, 39234 }, -- Plague-Impervious Boots } }, { -- GundrakColossus / 35 @@ -958,6 +1010,10 @@ data["Gundrak"] = { { 4, 37636 }, -- Helm of Cheated Fate { 5, 37634 }, -- Bracers of the Divine Elemental { 6, 37635 }, -- Pauldrons of the Colossus + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39225 }, -- Cloak of Armed Strife + { 29, 39224 }, -- Leggings of Discord + --{ 30, xxx }, -- xxx } }, { -- GundrakMoorabi / 36 @@ -979,6 +1035,10 @@ data["Gundrak"] = { { 5, 37632 }, -- Mojo Frenzy Greaves { 6, 37631 }, -- Fist of the Deity { 16, "ac2040" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39221 }, -- Wraith Spear + { 29, 39228 }, -- Web Cocoon Grips + --{ 30, xxx }, -- xxx } }, { -- GundrakEckHEROIC / 37 @@ -994,6 +1054,10 @@ data["Gundrak"] = { { 4, 43312 }, -- Gorloc Muddy Footwraps { 5, 43311 }, -- Helmet of the Shrine { 6, 43310 }, -- Engraved Chestplate of Eck + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39226 }, -- Maexxna's Femur + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- GundrakGaldarah / 38 @@ -1021,6 +1085,10 @@ data["Gundrak"] = { { 16, 43102 }, -- Frozen Orb { 18, "ac2152" }, { 19, "ac1864" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 44660 }, -- Drakescale Collar + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -1075,6 +1143,10 @@ data["HallsofLightning"] = { { 5, 37814 }, -- Iron Dwarf Smith Pauldrons { 6, 37826 }, -- The General's Steel Girdle { 16, "ac1834" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39192 }, -- Gloves of Dark Gestures + { 29, 39141 }, -- Deflection Band + --{ 30, xxx }, -- xxx } }, { -- HallsofLightningVolkhan / 46 @@ -1097,6 +1169,10 @@ data["HallsofLightning"] = { { 5, 37842 }, -- Belt of Vivacity { 6, 37841 }, -- Slag Footguards { 16, "ac2042" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39140 }, -- Knife of Incision + { 29, 39191 }, -- Splint-Bound Leggings + --{ 30, xxx }, -- xxx } }, { -- HallsofLightningIonar / 47 @@ -1118,6 +1194,10 @@ data["HallsofLightning"] = { { 4, 37845 }, -- Cord of Swirling Winds { 5, 37826 }, -- The General's Steel Girdle { 6, 37844 }, -- Winged Talisman + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39146 }, -- Collar of Dissolution + { 29, 39190 }, -- Agonal Sash + --{ 30, xxx }, -- xxx } }, { -- HallsofLightningLoken / 48 @@ -1152,6 +1232,10 @@ data["HallsofLightning"] = { { 16, 43102 }, -- Frozen Orb { 18, 41799 }, -- Design: Eternal Earthsiege Diamond { 20, "ac1867" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 40488 }, -- Ice Spire Scepter + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -1203,6 +1287,10 @@ data["HallsofStone"] = { { 3, 37652 }, -- Spaulders of Krystallus { 4, 37650 }, -- Shardling Legguards { 5, 37651 }, -- The Prospector's Prize + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39198 }, -- Frostblight Pauldrons + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- HallsofStoneMaiden / 40 @@ -1224,6 +1312,10 @@ data["HallsofStone"] = { { 5, 38617 }, -- Woeful Band { 6, 38618 }, -- Hammer of Grief { 16, "ac1866" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39215 }, -- Boots of the Follower + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- HallsofStoneTribunal / 42 @@ -1245,6 +1337,10 @@ data["HallsofStone"] = { { 5, 37654 }, -- Sabatons of the Ages { 6, 37653 }, -- Sword of Justice { 16, "ac2154" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39200 }, -- Grieving Spellblade + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- HallsofStoneSjonnir / 43 @@ -1272,6 +1368,10 @@ data["HallsofStone"] = { { 16, 43102 }, -- Frozen Orb { 18, 41792 }, -- Design: Deft Monarch Topaz { 20, "ac2155" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 43993 }, -- Greatring of Collision + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -1325,6 +1425,10 @@ data["TheCullingOfStratholme"] = { { 4, 37678 }, -- Bile-Cured Gloves { 5, 37679 }, -- Spaulders of the Abomination { 6, 37675 }, -- Legplates of Steel Implants + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 40429 }, -- Crimson Steel + { 29, 43988 }, -- Gale-Proof Cloak + { 30, 43992 }, -- Volitant Amulet } }, { -- CoTStratholmeSalramm @@ -1346,6 +1450,10 @@ data["TheCullingOfStratholme"] = { { 4, 37682 }, -- Bindings of Dark Will { 5, 37683 }, -- Necromancer's Amulet { 6, 37681 }, -- Gavel of the Fleshcrafter + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 43989 }, -- Remembrance Girdle + { 29, 43991 }, -- Legguards of Composure + { 30, 40428 }, -- Titan's Outlook } }, { -- CoTStratholmeEpoch @@ -1367,6 +1475,10 @@ data["TheCullingOfStratholme"] = { { 4, 37686 }, -- Cracked Epoch Grasps { 5, 37688 }, -- Legplates of the Infinite Drakonid { 6, 37685 }, -- Mobius Band + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28,40427 }, -- Circle of Arcane Streams + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- CoTStratholmeMalGanis @@ -1398,6 +1510,10 @@ data["TheCullingOfStratholme"] = { { 10, 37689 }, -- Pendant of the Nathrezim { 11, 37692 }, -- Pierce's Pistol { 16, 43102 }, -- Frozen Orb + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39235 }, -- Bone-Framed Bracers + { 29, 44658 }, -- Chain of the Ancient Wyrm + --{ 30, xxx }, -- xxx } }, { -- CoTStratholmeInfiniteCorruptorHEROIC @@ -1409,6 +1525,10 @@ data["TheCullingOfStratholme"] = { [HEROIC_DIFF] = { { 1, 47241 }, -- Emblem of Triumph { 3, 43951 }, -- Reins of the Bronze Drake + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39468 }, -- The Stray + { 29, 39427 }, -- Omen of Ruin + { 30, 39473 }, -- Contortion } }, { -- CoTHillsbradTrash @@ -1452,6 +1572,10 @@ data["TheNexus"] = { { 4, 37731 }, -- Opposed Stasis Leggings { 5, 37730 }, -- Cleric's Linen Shoes { 6, 37729 }, -- Grips of Sculptured Icicles + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39390 }, -- Resurgent Phantom Bindings + { 29, 39394 }, -- Charmed Cierge + { 30, 39398 }, -- Massive Skeletal Ribcage } }, { -- TheNexusTelestra / 6 @@ -1500,6 +1624,10 @@ data["TheNexus"] = { { 4, 37150 }, -- Rift Striders { 5, 37141 }, -- Amulet of Dazzling Light { 16, "ac2037" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39386 }, -- Tunic of Dislocation + { 29, 39396 }, -- Gown of Blaumeux + { 30, 39407 }, -- Circle of Life } }, { -- TheNexusOrmorok / 8 @@ -1520,6 +1648,10 @@ data["TheNexus"] = { { 4, 37155 }, -- Frozen Forest Kilt { 5, 37152 }, -- Girdle of Ice { 6, 37151 }, -- Band of Frosted Thorns + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39389 }, -- Signet of the Malevolent + { 29, 39395 }, -- Thane's Tainted Greathelm + --{ 30, xxx }, -- xxx } }, { -- TheNexusKeristrasza / 10 @@ -1547,6 +1679,10 @@ data["TheNexus"] = { { 16, 43102 }, -- Frozen Orb { 18, 41794 }, -- Design: Deadly Monarch Topaz { 20, "ac2036" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39422 }, -- Staff of the Plaguehound + { 29, 44657 }, -- Torque of the Red Dragonflight + --{ 30, xxx }, -- xxx } }, KEYS, @@ -1586,6 +1722,10 @@ data["TheOculus"] = { { 4, 37256 }, -- Scaled Armor of Drakos { 5, 37257 }, -- Band of Torture { 6, 37255 }, -- The Interrogator + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39399 }, -- Helm of the Vast Legions + { 29, 39404 }, -- Cloak of Mastery + --{ 30, xxx }, -- xxx } }, { -- OcuCloudstrider / 63 @@ -1607,6 +1747,10 @@ data["TheOculus"] = { { 4, 37262 }, -- Azure Ringmail Leggings { 5, 37263 }, -- Legplates of the Oculus Guardian { 6, 37260 }, -- Cloudstrider's Waraxe + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39401 }, -- Circle of Death + { 29, 39405 }, -- Helmet of the Inner Sanctum + --{ 30, xxx }, -- xxx } }, { -- OcuUrom / 62 @@ -1630,6 +1774,10 @@ data["TheOculus"] = { { 5, 37195 }, -- Band of Enchanted Growth { 6, 37264 }, -- Pendulum of Telluric Currents { 16, 21525 }, -- Green Winter Hat + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39415 }, -- Shroud of the Citadel + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- OcuEregos / 64 @@ -1667,6 +1815,10 @@ data["TheOculus"] = { { 23, "ac2046" }, { 24, "ac2045" }, { 25, "ac2044" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39310 }, -- Mantle of the Extensive Mind + { 29, 40497 }, -- Black Ice + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -1715,6 +1867,10 @@ data["VioletHold"] = { { 3, 43406 }, -- Cloak of the Gushing Wound { 4, 43405 }, -- Sabatons of Erekem { 5, 43407 }, -- Stormstrike Mace + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39275 }, -- Contagion Gloves + { 29, 39281 }, -- Infection Repulser + --{ 30, xxx }, -- xxx } }, { -- VioletHoldZuramat / 27 @@ -1732,6 +1888,10 @@ data["VioletHold"] = { { 3, 43403 }, -- Shroud of Darkness { 4, 43402 }, -- The Obliterator Greaves { 5, 43404 }, -- Zuramat's Necklace + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + --{ 28, xxx }, -- xxx + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- VioletHoldXevozz / 28 @@ -1749,6 +1909,10 @@ data["VioletHold"] = { { 3, 37867 }, -- Footwraps of Teleportation { 4, 37868 }, -- Girdle of the Ethereal { 5, 37861 }, -- Necklace of Arcane Spheres + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39272 }, -- Drape of Surgery + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- VioletHoldIchoron / 29 @@ -1766,6 +1930,10 @@ data["VioletHold"] = { { 3, 43401 }, -- Water-Drenched Robe { 4, 37862 }, -- Gauntlets of the Water Revenant { 5, 37869 }, -- Globule Signet + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39273 }, -- Sullen Cloth Boots + { 29, 39279 }, -- Blistered Belt of Decay + --{ 30, xxx }, -- xxx } }, { -- VioletHoldMoragg / 30 @@ -1783,6 +1951,10 @@ data["VioletHold"] = { { 3, 43410 }, -- Moragg's Chestguard { 4, 43408 }, -- Solitare of Reflecting Beams { 5, 43409 }, -- Saliva Corroded Pike + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + --{ 28, xxx }, -- xxx + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- VioletHoldLavanthor / 31 @@ -1800,6 +1972,10 @@ data["VioletHold"] = { { 3, 37870 }, -- Twin-Headed Boots { 4, 37872 }, -- Lavanthor's Talisman { 5, 37871 }, -- The Key + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + --{ 28, xxx }, -- xxx + --{ 29, xxx }, -- xxx + --{ 30, xxx }, -- xxx } }, { -- VioletHoldCyanigosa / 32 @@ -1825,6 +2001,10 @@ data["VioletHold"] = { { 10, 37873 }, -- Mark of the War Prisoner { 16, 43102 }, -- Frozen Orb { 18, 41791 }, -- Design: Thick Autumn's Glow + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39426 }, -- Wand of the Archlich + { 29, 40511 }, -- Focusing Energy Epaulets + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -1878,6 +2058,10 @@ data["UtgardeKeep"] = { { 5, 37179 }, -- Infantry Assault Blade { 6, 37177 }, -- Wand of the San'layn { 16, "ac1919" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39392 }, -- Veiled Amulet of Life + { 29, 39379 }, -- Spectral Rider's Girdle + --{ 30, xxx }, -- xxx } }, { -- UtgardeKeepSkarvald / 3 @@ -1898,6 +2082,10 @@ data["UtgardeKeep"] = { { 4, 37184 }, -- Dalronn's Jerkin { 5, 37182 }, -- Helmet of the Constructor { 6, 37181 }, -- Dagger of Betrayal + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39309 }, -- Leggings of the Instructor + { 29, 39344 }, -- Slayer of the Lifeless + --{ 30, xxx }, -- xxx } }, { -- UtgardeKeepIngvar / 4 @@ -1926,6 +2114,10 @@ data["UtgardeKeep"] = { { 16, 43102 }, -- Frozen Orb { 18, 41793 }, -- Design: Fierce Monarch Topaz { 20, "ac1658" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39424 }, -- The Soulblade + { 29, 40519 }, -- Footsteps of Malygos + { 30, 40474 }, -- Surge Needle Ring } }, { -- Trash @@ -1978,6 +2170,10 @@ data["UtgardePinnacle"] = { { 5, 37368 }, -- Silent Spectator Shoulderpads { 6, 37367 }, -- Echoing Stompers { 16, "ac2043" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39299 }, -- Rapid Attack Gloves + { 29, 39296 }, -- Accursed Bow of the Elite + { 30, 39308 }, -- Girdle of Lenience } }, { -- UPPalehoof / 59 @@ -1999,6 +2195,10 @@ data["UtgardePinnacle"] = { { 4, 37373 }, -- Massive Spaulders of the Jormungar { 5, 37376 }, -- Ferocious Pauldrons of the Rhino { 6, 37371 }, -- Ring of the Frenzied Wolvar + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39298 }, -- Waistguard of the Tutor + { 29, 39284 }, -- Miasma Mantle + { 30, 39295 }, -- Cowl of Sheet Lightning } }, { -- UPSkadi / 56 @@ -2022,6 +2222,10 @@ data["UtgardePinnacle"] = { { 16, 44151 }, -- Reins of the Blue Proto-Drake { 18, "ac1873" }, { 19, "ac2156" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39297 }, -- Cloak of Darkening + { 29, 39294 }, -- Arc-Scorched Helmet + { 30, 39472 }, -- Chain of Latent Energies } }, { -- UPYmiron / 57 @@ -2056,6 +2260,10 @@ data["UtgardePinnacle"] = { { 18, 41797 }, -- Design: Austere Earthsiege Diamond { 20, "ac1790" }, { 21, "ac2157" }, + { 27, "INV_Box_01", nil, AL["Titan Rune"], nil }, + { 28, 39194 }, -- Rusted-Link Spiked Gauntlets + { 29, 39423 }, -- Hammer of the Astral Plane + --{ 30, xxx }, -- xxx } }, { -- Trash @@ -2569,19 +2777,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{15931}}, AtlasMapBossID = "1", NameColor = BLUE, - [RAID10_DIFF] = { - { 1, 39192 }, -- Gloves of Dark Gestures - { 2, 39190 }, -- Agonal Sash - { 3, 39191 }, -- Splint-Bound Leggings - { 4, 39189 }, -- Boots of Persistence - { 5, 39188 }, -- Chivalric Chestguard - { 6, 39139 }, -- Ravaging Sabatons - { 7, 39146 }, -- Collar of Dissolution - { 8, 39193 }, -- Band of Neglected Pleas - { 9, 39141 }, -- Deflection Band - { 10, 39140 }, -- Knife of Incision - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 39719 }, -- Mantle of the Locusts { 2, 39721 }, -- Sash of the Parlor { 3, 39720 }, -- Leggings of Atrophy @@ -2615,20 +2811,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{15940}}, AtlasMapBossID = "2", NameColor = BLUE, - [RAID10_DIFF] = { - { 1, 39216 }, -- Sash of Mortal Desire - { 2, 39215 }, -- Boots of the Follower - { 3, 39196 }, -- Boots of the Worshiper - { 4, 39217 }, -- Avenging Combat Leggings - { 5, 39194 }, -- Rusted-Link Spiked Gauntlets - { 6, 39198 }, -- Frostblight Pauldrons - { 7, 39195 }, -- Bracers of Lost Sentiments - { 8, 39197 }, -- Gauntlets of the Master - { 9, 39199 }, -- Watchful Eye - { 10, 39200 }, -- Grieving Spellblade - { 16, "ac1997" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 39732 }, -- Faerlina's Madness { 2, 39731 }, -- Punctilious Bindings { 3, 39733 }, -- Gloves of Token Respect @@ -2653,7 +2836,8 @@ data["NaxxramasWrath"] = { { 22, 39757 }, -- Idol of Worship { 23, 39728 }, -- Totem of Misery { 24, 39730 }, -- Widow's Fury - { 26, "ac2140" }, + { 26, "ac1997" }, + { 28, "ac2140" }, }, }, { -- NAXMaexxna @@ -2664,20 +2848,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{15928}}, AtlasMapBossID = "3", NameColor = BLUE, - [RAID10_DIFF] = { - { 1, 39225 }, -- Cloak of Armed Strife - { 2, 39230 }, -- Spaulders of the Monstrosity - { 3, 39224 }, -- Leggings of Discord - { 4, 39228 }, -- Web Cocoon Grips - { 5, 39232 }, -- Pendant of Lost Vocations - { 6, 39231 }, -- Timeworn Silken Band - { 7, 39229 }, -- Embrace of the Spider - { 8, 39226 }, -- Maexxna's Femur - { 9, 39221 }, -- Wraith Spear - { 10, 39233 }, -- Aegis of Damnation - { 16, "ac1858" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40250 }, -- Aged Winter Cloak { 2, 40254 }, -- Cloak of Averted Crisis { 3, 40252 }, -- Cloak of the Shadowed Sun @@ -2702,7 +2873,8 @@ data["NaxxramasWrath"] = { { 22, 39766 }, -- Matriarch's Spawn { 23, 39763 }, -- Wraith Strike { 24, 39758 }, -- The Jawbone - { 26, "ac1859" }, + { 26, "ac1858" }, + { 28, "ac1859" }, }, }, -- The Plague Quarter @@ -2714,19 +2886,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{16590}}, AtlasMapBossID = "1", NameColor = PURPLE, - [RAID10_DIFF] = { - { 1, 39241 }, -- Dark Shroud of the Scourge - { 2, 39242 }, -- Robes of Hoarse Breaths - { 3, 39240 }, -- Noth's Curse - { 4, 39237 }, -- Spaulders of Resumed Battle - { 5, 39243 }, -- Handgrips of the Foredoomed - { 6, 39236 }, -- Trespasser's Boots - { 7, 39239 }, -- Chestplate of the Risen Soldier - { 8, 39235 }, -- Bone-Framed Bracers - { 9, 39234 }, -- Plague-Impervious Boots - { 10, 39244 }, -- Ring of the Fated - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40602 }, -- Robes of Mutation { 2, 40198 }, -- Bands of Impurity { 3, 40197 }, -- Gloves of the Fallen Wizard @@ -2760,20 +2920,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{16309}}, AtlasMapBossID = "2", NameColor = PURPLE, - [RAID10_DIFF] = { - { 1, 39252 }, -- Preceptor's Bindings - { 2, 39254 }, -- Saltarello Shoes - { 3, 39247 }, -- Cuffs of Dark Shadows - { 4, 39248 }, -- Tunic of the Lost Pack - { 5, 39251 }, -- Necrogenic Belt - { 6, 39249 }, -- Shoulderplates of Bloodshed - { 7, 39246 }, -- Amulet of Autopsy - { 8, 39250 }, -- Ring of Holy Cleansing - { 9, 39245 }, -- Demise - { 10, 39255 }, -- Staff of the Plague Beast - { 16, "ac1996" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40250 }, -- Aged Winter Cloak { 2, 40254 }, -- Cloak of Averted Crisis { 3, 40252 }, -- Cloak of the Shadowed Sun @@ -2798,7 +2945,8 @@ data["NaxxramasWrath"] = { { 22, 40207 }, -- Sigil of Awareness { 23, 40208 }, -- Cryptfiend's Bite { 24, 40233 }, -- The Undeath Carrier - { 26, "ac2139" }, + { 26, "ac1996" }, + { 28, "ac2139" }, }, }, { -- NAXLoatheb @@ -2809,18 +2957,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{16110}}, AtlasMapBossID = "3", NameColor = PURPLE, - [RAID10_DIFF] = { - { 1, 39259 }, -- Fungi-Stained Coverings - { 2, 39260 }, -- Helm of the Corrupted Mind - { 3, 39258 }, -- Legplates of Inescapable Death - { 4, 39257 }, -- Loatheb's Shadow - { 5, 39256 }, -- Sulfur Stave - { 16, 40622 }, -- Spaulders of the Lost Conqueror - { 17, 40623 }, -- Spaulders of the Lost Protector - { 18, 40624 }, -- Spaulders of the Lost Vanquisher - { 20, "ac2182" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40247 }, -- Cowl of Innocent Delight { 2, 40246 }, -- Boots of Impetuous Ideals { 3, 40249 }, -- Vest of Vitality @@ -2834,7 +2971,8 @@ data["NaxxramasWrath"] = { { 16, 40637 }, -- Mantle of the Lost Conqueror { 17, 40638 }, -- Mantle of the Lost Protector { 18, 40639 }, -- Mantle of the Lost Vanquisher - { 20, "ac2183" }, + { 20, "ac2182" }, + { 22, "ac2183" }, }, }, -- The Military Quarter @@ -2846,19 +2984,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{16582}}, AtlasMapBossID = "1", NameColor = _RED, - [RAID10_DIFF] = { - { 1, 39297 }, -- Cloak of Darkening - { 2, 39310 }, -- Mantle of the Extensive Mind - { 3, 39309 }, -- Leggings of the Instructor - { 4, 39299 }, -- Rapid Attack Gloves - { 5, 39308 }, -- Girdle of Lenience - { 6, 39307 }, -- Iron Rings of Endurance - { 7, 39306 }, -- Plated Gloves of Relief - { 8, 39298 }, -- Waistguard of the Tutor - { 9, 39311 }, -- Scepter of Murmuring Spirits - { 10, 39296 }, -- Accursed Bow of the Elite - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40325 }, -- Bindings of the Expansive Mind { 2, 40326 }, -- Boots of Forlorn Wishes { 3, 40305 }, -- Spaulders of Egotism @@ -2892,19 +3018,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{16279}}, AtlasMapBossID = "2", NameColor = _RED, - [RAID10_DIFF] = { - { 1, 39390 }, -- Resurgent Phantom Bindings - { 2, 39386 }, -- Tunic of Dislocation - { 3, 39391 }, -- Heinous Mail Chestguard - { 4, 39379 }, -- Spectral Rider's Girdle - { 5, 39345 }, -- Girdle of the Ascended Phantom - { 6, 39369 }, -- Sabatons of Deathlike Gloom - { 7, 39392 }, -- Veiled Amulet of Life - { 8, 39389 }, -- Signet of the Malevolent - { 9, 39388 }, -- Spirit-World Glass - { 10, 39344 }, -- Slayer of the Lifeless - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40250 }, -- Aged Winter Cloak { 2, 40254 }, -- Cloak of Averted Crisis { 3, 40252 }, -- Cloak of the Shadowed Sun @@ -2939,18 +3053,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{16155},{16153},{16139},{16154}}, AtlasMapBossID = "3", NameColor = _RED, - [RAID10_DIFF] = { - { 1, 39396 }, -- Gown of Blaumeux - { 2, 39397 }, -- Pauldrons of Havoc - { 3, 39395 }, -- Thane's Tainted Greathelm - { 4, 39393 }, -- Claymore of Ancient Power - { 5, 39394 }, -- Charmed Cierge - { 16, 40610 }, -- Chestguard of the Lost Conqueror - { 17, 40611 }, -- Chestguard of the Lost Protector - { 18, 40612 }, -- Chestguard of the Lost Vanquisher - { 20, "ac2176" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40349 }, -- Gloves of Peaceful Death { 2, 40344 }, -- Helm of the Grave { 3, 40352 }, -- Leggings of Voracious Shadows @@ -2963,7 +3066,8 @@ data["NaxxramasWrath"] = { { 16, 40625 }, -- Breastplate of the Lost Conqueror { 17, 40626 }, -- Breastplate of the Lost Protector { 18, 40627 }, -- Breastplate of the Lost Vanquisher - { 20, "ac2177" }, + { 20, "ac2176" }, + { 22, "ac2177" }, }, }, -- The Construct Quarter @@ -2974,19 +3078,7 @@ data["NaxxramasWrath"] = { Level = 999, DisplayIDs = {{16174}}, AtlasMapBossID = 1, - [RAID10_DIFF] = { - { 1, 39272 }, -- Drape of Surgery - { 2, 39273 }, -- Sullen Cloth Boots - { 3, 39275 }, -- Contagion Gloves - { 4, 39274 }, -- Retcher's Shoulderpads - { 5, 39267 }, -- Abomination Shoulderblades - { 6, 39262 }, -- Gauntlets of Combined Strength - { 7, 39261 }, -- Tainted Girdle of Mending - { 8, 39271 }, -- Blade of Dormant Memories - { 9, 39270 }, -- Hatestrike - { 16, "ac1856" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40271 }, -- Sash of Solitude { 2, 40269 }, -- Boots of Persuasion { 3, 40260 }, -- Belt of the Tortured @@ -3010,7 +3102,8 @@ data["NaxxramasWrath"] = { { 21, 40264 }, -- Split Greathammer { 22, 40266 }, -- Hero's Surrender { 23, 40265 }, -- Arrowsong - { 25, "ac1857" }, + { 25, "ac1856" }, + { 27, "ac1857" }, }, }, { -- NAXGrobbulus @@ -3020,19 +3113,7 @@ data["NaxxramasWrath"] = { Level = 999, DisplayIDs = {{16035}}, AtlasMapBossID = 2, - [RAID10_DIFF] = { - { 1, 39284 }, -- Miasma Mantle - { 2, 39285 }, -- Handgrips of Turmoil - { 3, 39283 }, -- Putrescent Bands - { 4, 39279 }, -- Blistered Belt of Decay - { 5, 39278 }, -- Bands of Anxiety - { 6, 39280 }, -- Leggings of Innumerable Barbs - { 7, 39282 }, -- Bone-Linked Amulet - { 8, 39277 }, -- Sealing Ring of Grobbulus - { 9, 39281 }, -- Infection Repulser - { 10, 39276 }, -- The Skull of Ruin - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40250 }, -- Aged Winter Cloak { 2, 40254 }, -- Cloak of Averted Crisis { 3, 40252 }, -- Cloak of the Shadowed Sun @@ -3067,42 +3148,7 @@ data["NaxxramasWrath"] = { Level = 999, DisplayIDs = {{16064}}, AtlasMapBossID = 3, - [RAID10_DIFF] = { - { 1, 39272 }, -- Drape of Surgery - { 2, 39284 }, -- Miasma Mantle - { 3, 39396 }, -- Gown of Blaumeux - { 4, 39309 }, -- Leggings of the Instructor - { 5, 39237 }, -- Spaulders of Resumed Battle - { 6, 39279 }, -- Blistered Belt of Decay - { 7, 39191 }, -- Splint-Bound Leggings - { 8, 39215 }, -- Boots of the Follower - { 9, 39294 }, -- Arc-Scorched Helmet - { 10, 39248 }, -- Tunic of the Lost Pack - { 11, 39194 }, -- Rusted-Link Spiked Gauntlets - { 12, 39251 }, -- Necrogenic Belt - { 13, 39379 }, -- Spectral Rider's Girdle - { 14, 39188 }, -- Chivalric Chestguard - { 15, 39345 }, -- Girdle of the Ascended Phantom - { 16, 39146 }, -- Collar of Dissolution - { 17, 39232 }, -- Pendant of Lost Vocations - { 18, 39193 }, -- Band of Neglected Pleas - { 19, 39388 }, -- Spirit-World Glass - { 20, 39200 }, -- Grieving Spellblade - { 21, 39344 }, -- Slayer of the Lifeless - { 22, 39281 }, -- Infection Repulser - { 23, 39394 }, -- Charmed Cierge - - { 101, 40622 }, -- Spaulders of the Lost Conqueror - { 102, 40623 }, -- Spaulders of the Lost Protector - { 103, 40624 }, -- Spaulders of the Lost Vanquisher - { 105, 40610 }, -- Chestguard of the Lost Conqueror - { 106, 40611 }, -- Chestguard of the Lost Protector - { 107, 40612 }, -- Chestguard of the Lost Vanquisher - { 116, 40619 }, -- Leggings of the Lost Conqueror - { 117, 40620 }, -- Leggings of the Lost Protector - { 118, 40621 }, -- Leggings of the Lost Vanquisher - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40247 }, -- Cowl of Innocent Delight { 2, 40289 }, -- Sympathetic Amice { 3, 40602 }, -- Robes of Mutation @@ -3160,19 +3206,7 @@ data["NaxxramasWrath"] = { Level = 999, DisplayIDs = {{16137}}, AtlasMapBossID = 4, - [RAID10_DIFF] = { - { 1, 39295 }, -- Cowl of Sheet Lightning - { 2, 39294 }, -- Arc-Scorched Helmet - { 3, 39293 }, -- Blackened Legplates of Feugen - { 4, 39292 }, -- Repelling Charge - { 5, 39291 }, -- Torment of the Banished - { 16, 40619 }, -- Leggings of the Lost Conqueror - { 17, 40620 }, -- Leggings of the Lost Protector - { 18, 40621 }, -- Leggings of the Lost Vanquisher - { 20, "ac2178" }, - { 21, "ac2180" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40303 }, -- Wraps of the Persecuted { 2, 40301 }, -- Cincture of Polarity { 3, 40296 }, -- Cover of Silence @@ -3186,8 +3220,10 @@ data["NaxxramasWrath"] = { { 16, 40634 }, -- Legplates of the Lost Conqueror { 17, 40635 }, -- Legplates of the Lost Protector { 18, 40636 }, -- Legplates of the Lost Vanquisher - { 20, "ac2179" }, - { 21, "ac2181" }, + { 20, "ac2178" }, + { 21, "ac2180" }, + { 23, "ac2179" }, + { 24, "ac2181" }, }, }, -- Frostwyrm Lair @@ -3199,22 +3235,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{16033}}, AtlasMapBossID = "1", NameColor = GREEN, - [RAID10_DIFF] = { - { 1, 39415 }, -- Shroud of the Citadel - { 2, 39404 }, -- Cloak of Mastery - { 3, 39409 }, -- Cowl of Winged Fear - { 4, 39408 }, -- Leggings of Sapphiron - { 5, 39399 }, -- Helm of the Vast Legions - { 6, 39405 }, -- Helmet of the Inner Sanctum - { 7, 39403 }, -- Helm of the Unsubmissive - { 8, 39398 }, -- Massive Skeletal Ribcage - { 9, 39401 }, -- Circle of Death - { 10, 39407 }, -- Circle of Life - { 16, 44569 }, -- Key to the Focusing Iris - { 18, "ac572" }, - { 19, "ac2146" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40381 }, -- Sympathy { 2, 40380 }, -- Gloves of Grandeur { 3, 40376 }, -- Legwraps of the Defeated Dragon @@ -3236,8 +3257,10 @@ data["NaxxramasWrath"] = { { 19, 40382 }, -- Soul of the Dead { 20, 40368 }, -- Murder { 22, 44577 }, -- Heroic Key to the Focusing Iris - { 24, "ac573" }, - { 25, "ac2147" }, + { 24, "ac572" }, + { 25, "ac2146" }, + { 27, "ac573" }, + { 28, "ac2147" }, }, }, { -- NAXKelThuzard @@ -3248,25 +3271,7 @@ data["NaxxramasWrath"] = { DisplayIDs = {{15945}}, AtlasMapBossID = "2", NameColor = GREEN, - [RAID10_DIFF] = { - { 1, 39425 }, -- Cloak of the Dying - { 2, 39421 }, -- Gem of Imprisoned Vassals - { 3, 39416 }, -- Kel'Thuzad's Reach - { 4, 39424 }, -- The Soulblade - { 5, 39420 }, -- Anarchy - { 6, 39417 }, -- Death's Bite - { 7, 39423 }, -- Hammer of the Astral Plane - { 8, 39422 }, -- Staff of the Plaguehound - { 9, 39426 }, -- Wand of the Archlich - { 10, 39419 }, -- Nerubian Conquerer - { 16, 40616 }, -- Helm of the Lost Conqueror - { 17, 40617 }, -- Helm of the Lost Protector - { 18, 40618 }, -- Helm of the Lost Vanquisher - { 20, "ac574" }, - { 21, "ac1658" }, - { 22, "ac2184" }, - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40405 }, -- Cape of the Unworthy Wizard { 2, 40403 }, -- Drape of the Deadly Foe { 3, 40398 }, -- Leggings of Mortal Arrogance @@ -3285,23 +3290,17 @@ data["NaxxramasWrath"] = { { 16, 40631 }, -- Crown of the Lost Conqueror { 17, 40632 }, -- Crown of the Lost Protector { 18, 40633 }, -- Crown of the Lost Vanquisher - { 20, "ac575" }, - { 21, "ac1658" }, - { 22, "ac2185" }, + { 20, "ac1658" }, + { 22, "ac574" }, + { 23, "ac2184" }, + { 25, "ac575" }, + { 26, "ac2185" }, }, }, { -- NAXTrash name = AL["Trash"], ExtraList = true, - [RAID10_DIFF] = { - { 1, 39467 }, -- Minion Bracers - { 2, 39472 }, -- Chain of Latent Energies - { 3, 39470 }, -- Medallion of the Disgraced - { 4, 39427 }, -- Omen of Ruin - { 5, 39468 }, -- The Stray - { 6, 39473 }, -- Contortion - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40410 }, -- Shadow of the Ghoul { 2, 40409 }, -- Boots of the Escaped Captive { 3, 40414 }, -- Shoulderguards of the Undaunted @@ -3332,22 +3331,7 @@ data["TheEyeOfEternity"] = { Level = 999, --DisplayIDs = {{17386}}, AtlasMapBossID = 1, - [RAID10_DIFF] = { - { 1, 40526 }, -- Gown of the Spell-Weaver - { 2, 40519 }, -- Footsteps of Malygos - { 3, 40511 }, -- Focusing Energy Epaulets - { 4, 40486 }, -- Necklace of the Glittering Chamber - { 5, 40474 }, -- Surge Needle Ring - { 6, 40491 }, -- Hailstorm - { 7, 40488 }, -- Ice Spire Scepter - { 8, 40489 }, -- Greatstaff of the Nexus - { 9, 40497 }, -- Black Ice - { 10, 40475 }, -- Barricade of Eternity - { 16, 43952 }, -- Reins of the Azure Drake - { 18, 44569 }, -- Key to the Focusing Iris - { 19, 44650 }, -- Heart of Magic - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40562 }, -- Hood of Rationality { 2, 40555 }, -- Mantle of Dissemination { 3, 40194 }, -- Blanketing Robes of Snow @@ -3392,20 +3376,7 @@ data["ObsidianSanctum"] = { Level = 999, --DisplayIDs = {{17386}}, AtlasMapBossID = 4, - [RAID10_DIFF] = { - { 1, 40428 }, -- Titan's Outlook - { 2, 40427 }, -- Circle of Arcane Streams - { 3, 40426 }, -- Signet of the Accord - { 4, 40433 }, -- Wyrmrest Band - { 5, 40430 }, -- Majestic Dragon Figurine - { 6, 40429 }, -- Crimson Steel - { 16, 40613 }, -- Gloves of the Lost Conqueror - { 17, 40614 }, -- Gloves of the Lost Protector - { 18, 40615 }, -- Gloves of the Lost Vanquisher - { 20, 43345 }, -- Dragon Hide Bag - { 21, 43347 }, -- Satchel of Spoils - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, 40437 }, -- Concealment Shoulderpads { 2, 40439 }, -- Mantle of the Eternal Sentinel { 3, 40451 }, -- Hyaline Helm of the Sniper @@ -3429,23 +3400,7 @@ data["ObsidianSanctum"] = { Level = 999, --DisplayIDs = {{17386}}, AtlasMapBossID = 1, - [RAID10_DIFF] = { - { 1, "INV_Box_01", nil, AL["One Drake Left"] }, - { 2, 43988 }, -- Gale-Proof Cloak - { 3, 43990 }, -- Blade-Scarred Tunic - { 4, 43991 }, -- Legguards of Composure - { 5, 43989 }, -- Remembrance Girdle - { 6, 43992 }, -- Volitant Amulet - { 8, "INV_Box_01", nil, AL["Two Drakes Left"] }, - { 9, 43995 }, -- Enamored Cowl - { 10, 43998 }, -- Chestguard of Flagrant Prowess - { 11, 43996 }, -- Sabatons of Firmament - { 12, 43994 }, -- Belabored Legplates - { 13, 43993 }, -- Greatring of Collision - { 16, "INV_Box_01", nil, AL["Three Drakes Left"] }, - { 17, 43986 }, -- Reins of the Black Drake - }, - [RAID25_DIFF] = { + [NORMAL_DIFF] = { { 1, "INV_Box_01", nil, AL["One Drake Left"] }, { 2, 44002 }, -- The Sanctum's Flowing Vestments { 3, 44003 }, -- Upstanding Spaulders From c95c8b43bc4663772547993a415ad5ba53360ffb Mon Sep 17 00:00:00 2001 From: Krullgor Date: Tue, 17 Jan 2023 18:04:02 +0100 Subject: [PATCH 5/5] add new loot sources for t7 10 man content, source: https://docs.google.com/spreadsheets/d/1Nb2MaGSq1RCy7Ha5E69J0OUSWNFer4wn1-SSTq56fx4/edit#gid=0 --- AtlasLootClassic_Data/source-wrath.lua | 334 ++++++++++++------------- 1 file changed, 167 insertions(+), 167 deletions(-) diff --git a/AtlasLootClassic_Data/source-wrath.lua b/AtlasLootClassic_Data/source-wrath.lua index 83720484..c9cd4da1 100644 --- a/AtlasLootClassic_Data/source-wrath.lua +++ b/AtlasLootClassic_Data/source-wrath.lua @@ -1149,139 +1149,139 @@ local SOURCE_DATA = { [39086] = {[3] = 5,[4] = 52567}, [39087] = {[3] = 5,[4] = 52568}, [39088] = {[3] = 5,[4] = 52569}, -[39139] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, -[39140] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, -[39141] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, -[39146] = {{[1] = 17,[2] = 1,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39188] = {{[1] = 17,[2] = 1,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39189] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, -[39190] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, -[39191] = {{[1] = 17,[2] = 1,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39192] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, -[39193] = {{[1] = 17,[2] = 1,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39194] = {{[1] = 17,[2] = 2,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39195] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, -[39196] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, -[39197] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, -[39198] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, -[39199] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, -[39200] = {{[1] = 17,[2] = 2,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39215] = {{[1] = 17,[2] = 2,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39216] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, -[39217] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, -[39221] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39224] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39225] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39226] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39228] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39229] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39230] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39231] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39232] = {{[1] = 17,[2] = 3,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39233] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, -[39234] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39235] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39236] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39237] = {{[1] = 17,[2] = 4,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39239] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39240] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39241] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39242] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39243] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39244] = {[1] = 17,[2] = 4,[3] = 1,[5] = 3}, -[39245] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39246] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39247] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39248] = {{[1] = 17,[2] = 5,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39249] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39250] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39251] = {{[1] = 17,[2] = 5,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39252] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39254] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39255] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, -[39256] = {[1] = 17,[2] = 6,[3] = 1,[5] = 3}, -[39257] = {[1] = 17,[2] = 6,[3] = 1,[5] = 3}, -[39258] = {[1] = 17,[2] = 6,[3] = 1,[5] = 3}, -[39259] = {[1] = 17,[2] = 6,[3] = 1,[5] = 3}, -[39260] = {[1] = 17,[2] = 6,[3] = 1,[5] = 3}, -[39261] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39262] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39267] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39270] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39271] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39272] = {{[1] = 17,[2] = 10,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39273] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39274] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39275] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, -[39276] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, -[39277] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, -[39278] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, -[39279] = {{[1] = 17,[2] = 11,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39280] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, -[39281] = {{[1] = 17,[2] = 11,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39282] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, -[39283] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, -[39284] = {{[1] = 17,[2] = 11,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39285] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, -[39291] = {[1] = 17,[2] = 13,[3] = 1,[5] = 3}, -[39292] = {[1] = 17,[2] = 13,[3] = 1,[5] = 3}, -[39293] = {[1] = 17,[2] = 13,[3] = 1,[5] = 3}, -[39294] = {{[1] = 17,[2] = 12,[3] = 1,[5] = 3},{[1] = 17,[2] = 13,[3] = 1,[5] = 3}}, -[39295] = {[1] = 17,[2] = 13,[3] = 1,[5] = 3}, -[39296] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39297] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39298] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39299] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39306] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39307] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39308] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39309] = {{[1] = 17,[2] = 7,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39310] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39311] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, -[39344] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39345] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39349] = {[3] = 18,[4] = 52840}, -[39350] = {[3] = 18,[4] = 59488}, -[39369] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39379] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39386] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39388] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3},{[1] = 8,[2] = 2,[3] = 1,[5] = 2}}, -[39389] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39390] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39391] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39392] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, -[39393] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 8,[2] = 2,[3] = 1,[5] = 2}}, -[39394] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39395] = {[1] = 17,[2] = 9,[3] = 1,[5] = 3}, -[39396] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[39397] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 8,[2] = 2,[3] = 1,[5] = 2}}, -[39398] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39399] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39401] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39403] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39404] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39405] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39407] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39408] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39409] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39415] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, -[39416] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39417] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39419] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39420] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39421] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39422] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39423] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39424] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39425] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39426] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, -[39427] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, -[39467] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, -[39468] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, -[39469] = {[3] = 18,[4] = 52843}, -[39470] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, -[39472] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, -[39473] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, +--[39139] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, +[39140] = {[1] = 5,[2] = 2,[3] = 1,[5] = 2}, +[39141] = {[1] = 5,[2] = 1,[3] = 1,[5] = 2}, +[39146] = {[1] = 5,[2] = 3,[3] = 1,[5] = 2}, +--[39188] = {{[1] = 17,[2] = 1,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, +--[39189] = {[1] = 17,[2] = 1,[3] = 1,[5] = 3}, +[39190] = {[1] = 5,[2] = 3,[3] = 1,[5] = 2}, +[39191] = {[1] = 5,[2] = 2,[3] = 1,[5] = 2}, +[39192] = {[1] = 5,[2] = 1,[3] = 1,[5] = 2}, +--[39193] = {{[1] = 17,[2] = 1,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, +[39194] = {[1] = 12,[2] = 4,[3] = 1,[5] = 2}, +--[39195] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, +--[39196] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, +--[39197] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, +[39198] = {[1] = 6,[2] = 1,[3] = 1,[5] = 2}, +--[39199] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, +[39200] = {[1] = 6,[2] = 3,[3] = 1,[5] = 2}, +[39215] = {[1] = 6,[2] = 2,[3] = 1,[5] = 2}, +--[39216] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, +--[39217] = {[1] = 17,[2] = 2,[3] = 1,[5] = 3}, +[39221] = {[1] = 4,[2] = 3,[3] = 1,[5] = 2}, +[39224] = {[1] = 4,[2] = 2,[3] = 1,[5] = 2}, +[39225] = {[1] = 4,[2] = 2,[3] = 1,[5] = 2}, +[39226] = {[1] = 4,[2] = 4,[3] = 1,[5] = 2}, +[39228] = {[1] = 4,[2] = 3,[3] = 1,[5] = 2}, +[39229] = {[1] = 4,[2] = 1,[3] = 1,[5] = 2}, +[39230] = {[1] = 4,[2] = 1,[3] = 1,[5] = 2}, +--[39231] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, +--[39232] = {{[1] = 17,[2] = 3,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, +--[39233] = {[1] = 17,[2] = 3,[3] = 1,[5] = 3}, +[39234] = {[1] = 4,[2] = 1,[3] = 1,[5] = 2}, +[39235] = {[1] = 7,[2] = 4,[3] = 1,[5] = 2}, +[39236] = {[1] = 3,[2] = 2,[3] = 1,[5] = 2}, +[39237] = {[1] = 3,[2] = 2,[3] = 1,[5] = 2}, +[39239] = {[1] = 3,[2] = 3,[3] = 1,[5] = 2}, +[39240] = {[1] = 3,[2] = 3,[3] = 1,[5] = 2}, +[39241] = {[1] = 3,[2] = 1,[3] = 1,[5] = 2}, +[39242] = {[1] = 3,[2] = 1,[3] = 1,[5] = 2}, +[39243] = {[1] = 3,[2] = 3,[3] = 1,[5] = 2}, +[39244] = {[1] = 3,[2] = 2,[3] = 1,[5] = 2}, +--[39245] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, +--[39246] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, +--[39247] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, +--[39248] = {{[1] = 17,[2] = 5,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, +[39249] = {[1] = 1,[2] = 1,[3] = 1,[5] = 2}, +--[39250] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, +[39251] = {{[1] = 1,[2] = 2,[3] = 1,[5] = 2},{[1] = 1,[2] = 3,[3] = 1,[5] = 2}}, +[39252] = {[1] = 2,[2] = 2,[3] = 1,[5] = 2}, +--[39254] = {[1] = 17,[2] = 5,[3] = 1,[5] = 3}, +[39255] = {[1] = 1,[2] = 1,[3] = 1,[5] = 2}, +--[39256] = {[1] = 17,[2] = 6,[3] = 1,[5] = 3}, +[39257] = {[1] = 2,[2] = 1,[3] = 1,[5] = 2}, +[39258] = {[1] = 1,[2] = 4,[3] = 1,[5] = 2}, +[39259] = {[1] = 2,[2] = 1,[3] = 1,[5] = 2}, +[39260] = {[1] = 1,[2] = 3,[3] = 1,[5] = 2}, +[39261] = {[1] = 2,[2] = 2,[3] = 1,[5] = 2}, +--[39262] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, +--[39267] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, +--[39270] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, +--[39271] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, +[39272] = {[1] = 10,[2] = 3,[3] = 1,[5] = 2}, +[39273] = {[1] = 10,[2] = 4,[3] = 1,[5] = 2}, +--[39274] = {[1] = 17,[2] = 10,[3] = 1,[5] = 3}, +[39275] = {[1] = 10,[2] = 1,[3] = 1,[5] = 2}, +--[39276] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, +--[39277] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, +--[39278] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, +[39279] = {[1] = 10,[2] = 4,[3] = 1,[5] = 2}, +--[39280] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, +[39281] = {[1] = 10,[2] = 1,[3] = 1,[5] = 2}, +--[39282] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, +--[39283] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, +[39284] = {[1] = 12,[2] = 2,[3] = 1,[5] = 2}, +--[39285] = {[1] = 17,[2] = 11,[3] = 1,[5] = 3}, +--[39291] = {[1] = 17,[2] = 13,[3] = 1,[5] = 3}, +--[39292] = {[1] = 17,[2] = 13,[3] = 1,[5] = 3}, +--[39293] = {[1] = 17,[2] = 13,[3] = 1,[5] = 3}, +[39294] = {[1] = 12,[2] = 3,[3] = 1,[5] = 2}, +[39295] = {[1] = 12,[2] = 2,[3] = 1,[5] = 2}, +[39296] = {[1] = 12,[2] = 1,[3] = 1,[5] = 2}, +[39297] = {[1] = 12,[2] = 3,[3] = 1,[5] = 2}, +[39298] = {[1] = 12,[2] = 2,[3] = 1,[5] = 2}, +[39299] = {[1] = 12,[2] = 1,[3] = 1,[5] = 2}, +--[39306] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, +--[39307] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, +[39308] = {[1] = 12,[2] = 1,[3] = 1,[5] = 2}, +[39309] = {[1] = 11,[2] = 2,[3] = 1,[5] = 2}, +[39310] = {[1] = 9,[2] = 4,[3] = 1,[5] = 2}, +--[39311] = {[1] = 17,[2] = 7,[3] = 1,[5] = 3}, +[39344] = {[1] = 11,[2] = 2,[3] = 1,[5] = 2}, +--[39345] = {{[1] = 17,[2] = 8,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, +--[39349] = {[3] = 18,[4] = 52840}, +--[39350] = {[3] = 18,[4] = 59488}, +--[39369] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, +[39379] = {[1] = 11,[2] = 1,[3] = 1,[5] = 2}, +[39386] = {[1] = 8,[2] = 3,[3] = 1,[5] = 2}, +[39388] = {[1] = 8,[2] = 2,[3] = 1,[5] = 2}, +[39389] = {[1] = 8,[2] = 4,[3] = 1,[5] = 2}, +[39390] = {[1] = 8,[2] = 1,[3] = 1,[5] = 2}, +--[39391] = {[1] = 17,[2] = 8,[3] = 1,[5] = 3}, +[39392] = {[1] = 11,[2] = 1,[3] = 1,[5] = 2}, +[39393] = {[1] = 8,[2] = 2,[3] = 1,[5] = 2}, +[39394] = {[1] = 8,[2] = 1,[3] = 1,[5] = 2}, +[39395] = {[1] = 8,[2] = 4,[3] = 1,[5] = 2}, +[39396] = {[1] = 8,[2] = 3,[3] = 1,[5] = 2}, +[39397] = {[1] = 8,[2] = 2,[3] = 1,[5] = 2}, +[39398] = {[1] = 8,[2] = 1,[3] = 1,[5] = 2}, +[39399] = {[1] = 9,[2] = 1,[3] = 1,[5] = 2}, +[39401] = {[1] = 9,[2] = 2,[3] = 1,[5] = 2}, +--[39403] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, +[39404] = {[1] = 9,[2] = 1,[3] = 1,[5] = 2}, +[39405] = {[1] = 9,[2] = 2,[3] = 1,[5] = 2}, +[39407] = {[1] = 8,[2] = 3,[3] = 1,[5] = 2}, +--[39408] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, +--[39409] = {[1] = 17,[2] = 14,[3] = 1,[5] = 3}, +[39415] = {[1] = 9,[2] = 3,[3] = 1,[5] = 2}, +[39416] = {[1] = 3,[2] = 4,[3] = 1,[5] = 2}, +[39417] = {[1] = 1,[2] = 5,[3] = 1,[5] = 2}, +[39419] = {[1] = 2,[2] = 3,[3] = 1,[5] = 2}, +--[39420] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, +--[39421] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, +[39422] = {[1] = 8,[2] = 5,[3] = 1,[5] = 2}, +[39423] = {[1] = 12,[2] = 4,[3] = 1,[5] = 2}, +[39424] = {[1] = 11,[2] = 3,[3] = 1,[5] = 2}, +--[39425] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, +[39426] = {[1] = 10,[2] = 7,[3] = 1,[5] = 2}, +[39427] = {[1] = 7,[2] = 5,[3] = 1,[5] = 2}, +--[39467] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, +[39468] = {[1] = 7,[2] = 5,[3] = 1,[5] = 2}, +--[39469] = {[3] = 18,[4] = 52843}, +--[39470] = {[1] = 17,[2] = 16,[3] = 1,[5] = 3}, +[39472] = {[1] = 12,[2] = 3,[3] = 1,[5] = 2}, +[39473] = {[1] = 7,[2] = 5,[3] = 1,[5] = 2}, [39491] = 40618, [39492] = {[1] = {[6] = {40612}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 3},[6] = {40612}}, [39493] = {[1] = {[6] = {40621}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 3},[6] = {40621}}, @@ -1864,11 +1864,11 @@ local SOURCE_DATA = { [40422] = {[1] = {[6] = {40634}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40634}}, [40423] = {[1] = {[6] = {40625}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40625}}, [40424] = 40637, -[40426] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, -[40427] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, -[40428] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, -[40429] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, -[40430] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, +--[40426] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, +[40427] = {[1] = 7,[2] = 3,[3] = 1,[5] = 2}, +[40428] = {[1] = 7,[2] = 2,[3] = 1,[5] = 2}, +[40429] = {[1] = 7,[2] = 1,[3] = 1,[5] = 2}, +--[40430] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, [40431] = {[1] = 19,[2] = 1,[3] = 1,[5] = 4}, [40432] = {[1] = 19,[2] = 1,[3] = 1,[5] = 4}, [40433] = {[1] = 19,[2] = 1,[3] = 1,[5] = {3,4}}, @@ -1902,17 +1902,17 @@ local SOURCE_DATA = { [40471] = {[1] = {[6] = {40627}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40627}}, [40472] = {[1] = {[6] = {40630}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40630}}, [40473] = 40633, -[40474] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, -[40475] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, -[40486] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, -[40488] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, -[40489] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, -[40491] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +[40474] = {[1] = 11,[2] = 3,[3] = 1,[5] = 2}, +--[40475] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +--[40486] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +[40488] = {[1] = 5,[2] = 4,[3] = 1,[5] = 2}, +--[40489] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +--[40491] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, [40493] = {[1] = {[6] = {40636}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40636}}, [40494] = 40639, [40495] = {[1] = {[6] = {40627}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40627}}, [40496] = {[1] = {[6] = {40630}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40630}}, -[40497] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +[40497] = {[1] = 9,[2] = 4,[3] = 1,[5] = 2}, [40499] = 40633, [40500] = {[1] = {[6] = {40636}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40636}}, [40502] = 40639, @@ -1924,7 +1924,7 @@ local SOURCE_DATA = { [40508] = {[1] = {[6] = {40626}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40626}}, [40509] = {[1] = {[6] = {40629}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40629}}, [40510] = 40632, -[40511] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +[40511] = {[1] = 10,[2] = 7,[3] = 1,[5] = 2}, [40512] = {[1] = {[6] = {40635}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40635}}, [40513] = 40638, [40514] = {[1] = {[6] = {40626}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40626}}, @@ -1932,14 +1932,14 @@ local SOURCE_DATA = { [40516] = 40632, [40517] = {[1] = {[6] = {40635}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40635}}, [40518] = 40638, -[40519] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +[40519] = {[1] = 11,[2] = 3,[3] = 1,[5] = 2}, [40520] = {[1] = {[6] = {40629}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40629}}, [40521] = 40632, [40522] = {[1] = {[6] = {40635}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40635}}, [40523] = {[1] = {[6] = {40626}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40626}}, [40524] = 40638, [40525] = {[1] = {[6] = {40626}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40626}}, -[40526] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +--[40526] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, [40527] = {[1] = {[6] = {40629}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40629}}, [40528] = 40632, [40529] = {[1] = {[6] = {40635}},[2] = {[1] = 25,[2] = 1,[3] = 1,[5] = 4},[6] = {40635}}, @@ -1998,9 +1998,9 @@ local SOURCE_DATA = { [40610] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, [40611] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, [40612] = {{[1] = 17,[2] = 9,[3] = 1,[5] = 3},{[1] = 17,[2] = 12,[3] = 1,[5] = 3}}, -[40613] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, -[40614] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, -[40615] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, +--[40613] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, +--[40614] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, +--[40615] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, [40616] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, [40617] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, [40618] = {[1] = 17,[2] = 15,[3] = 1,[5] = 3}, @@ -2773,7 +2773,7 @@ local SOURCE_DATA = { [43344] = {[3] = 18,[4] = 58331}, [43345] = {[1] = 19,[2] = 1,[3] = 1,[5] = {3,4}}, [43346] = {[1] = 19,[2] = 1,[3] = 1,[5] = 4}, -[43347] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, +--[43347] = {[1] = 19,[2] = 1,[3] = 1,[5] = 3}, [43350] = {[3] = 18,[4] = 58301}, [43351] = {[3] = 18,[4] = 58302}, [43353] = {10,2,1}, @@ -2976,18 +2976,18 @@ local SOURCE_DATA = { [43973] = {[3] = 11,[4] = 59584}, [43974] = {[3] = 11,[4] = 59583}, [43975] = {[3] = 11,[4] = 59588}, -[43986] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, +--[43986] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, [43987] = {[3] = 13,[4] = 59625}, -[43988] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43989] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43990] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43991] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43992] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43993] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43994] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43995] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, +[43988] = {[1] = 7,[2] = 1,[3] = 1,[5] = 2}, +[43989] = {[1] = 7,[2] = 2,[3] = 1,[5] = 2}, +--[43990] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, +[43991] = {[1] = 7,[2] = 2,[3] = 1,[5] = 2}, +[43992] = {[1] = 7,[2] = 1,[3] = 1,[5] = 2}, +[43993] = {[1] = 6,[2] = 4,[3] = 1,[5] = 2}, +--[43994] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, +[43995] = {[1] = 3,[2] = 4,[3] = 1,[5] = 2}, [43996] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, -[43998] = {[1] = 19,[2] = 2,[3] = 1,[5] = 3}, +[43998] = {[1] = 1,[2] = 5,[3] = 1,[5] = 2}, [44000] = {[1] = 19,[2] = 2,[3] = 1,[5] = 4}, [44002] = {[1] = 19,[2] = 2,[3] = 1,[5] = 4}, [44003] = {[1] = 19,[2] = 2,[3] = 1,[5] = 4}, @@ -3051,16 +3051,16 @@ local SOURCE_DATA = { [44504] = {[3] = 12,[4] = 60874}, [44554] = {[3] = 11,[4] = 60969}, [44558] = {[3] = 11,[4] = 60971}, -[44569] = {{[1] = 17,[2] = 14,[3] = 1,[5] = 3},{[1] = 18,[2] = 1,[3] = 1,[5] = 3}}, +--[44569] = {{[1] = 17,[2] = 14,[3] = 1,[5] = 3},{[1] = 18,[2] = 1,[3] = 1,[5] = 3}}, [44577] = {{[1] = 17,[2] = 14,[3] = 1,[5] = 4},{[1] = 18,[2] = 1,[3] = 1,[5] = 4}}, [44581] = 44577, [44582] = 44569, -[44650] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, +--[44650] = {[1] = 18,[2] = 1,[3] = 1,[5] = 3}, [44651] = {[1] = 18,[2] = 1,[3] = 1,[5] = 4}, -[44657] = 44650, -[44658] = 44650, +[44657] = {[1] = 8,[2] = 5,[3] = 1,[5] = 2}, +[44658] = {[1] = 7,[2] = 4,[3] = 1,[5] = 2}, [44659] = 44650, -[44660] = 44650, +[44660] = {[1] = 4,[2] = 5,[3] = 1,[5] = 2}, [44661] = 44651, [44662] = 44651, [44664] = 44651,