From c04a9f76baf32caf820a882900fe4da2faf7ef63 Mon Sep 17 00:00:00 2001 From: Dillonzer Date: Thu, 1 Jun 2023 16:59:23 -0600 Subject: [PATCH 1/2] Updating UI and Fixing Dungeon List --- MythicPlusLoot.lua | 37 +++++++++++++++++++++++++++++++++++-- locales/deDE.lua | 7 ++++++- locales/enUS.lua | 6 ++++++ locales/esES.lua | 7 ++++++- locales/esMX.lua | 7 ++++++- locales/frFR.lua | 7 ++++++- locales/itIT.lua | 7 ++++++- locales/koKR.lua | 6 ++++++ locales/ptBR.lua | 7 ++++++- locales/ruRU.lua | 6 ++++++ tables.lua | 32 ++++++++++++++++---------------- 11 files changed, 105 insertions(+), 24 deletions(-) diff --git a/MythicPlusLoot.lua b/MythicPlusLoot.lua index fed9154..0a7ace6 100644 --- a/MythicPlusLoot.lua +++ b/MythicPlusLoot.lua @@ -538,7 +538,7 @@ function createItems(frame, slotText, mythicLevel, classText, specText) local shift_key = IsShiftKeyDown() if button == "LeftButton" then if shift_key then - sendItemLink(item["link"]) + sendItemLink(v["link"]) end elseif button == "RightButton" then createFavItem(frame, f, k); @@ -552,7 +552,7 @@ function createItems(frame, slotText, mythicLevel, classText, specText) end local slotText, mythicValue, mythicLevel, mythicText, sourceText; -MPL.BackdropColor = {0.058823399245739, 0.058823399245739, 0.058823399245739, 0.9} +MPL.BackdropColor = {0.058823399245739, 0.058823399245739, 0.058823399245739, 0.7} function closeMainFrame() if frame and framesInitialized then @@ -566,6 +566,31 @@ function MPL:showInterface() if not framesInitialized then return end end +local function CreateBorder(self) + if not self.borders then + self.borders = {} + for i=1, 4 do + self.borders[i] = self:CreateLine(nil, "BACKGROUND", nil, 0) + local l = self.borders[i] + l:SetThickness(1) + l:SetColorTexture(1, 1, 0, 1) + if i==1 then + l:SetStartPoint("TOPLEFT") + l:SetEndPoint("TOPRIGHT") + elseif i==2 then + l:SetStartPoint("TOPRIGHT") + l:SetEndPoint("BOTTOMRIGHT") + elseif i==3 then + l:SetStartPoint("BOTTOMRIGHT") + l:SetEndPoint("BOTTOMLEFT") + else + l:SetStartPoint("BOTTOMLEFT") + l:SetEndPoint("TOPLEFT") + end + end + end +end + function initFrames() frame = CreateFrame("Frame", "MPLFrame", UIParent); @@ -585,6 +610,14 @@ function initFrames() tex:SetAllPoints(); tex:SetColorTexture(unpack(MPL.BackdropColor)); + --adding border + CreateBorder(frame) + + --moveable + frame:SetMovable(true) + frame:EnableMouse(true) + frame:RegisterForDrag("LeftButton") + -- Close button frame.closeButton = CreateFrame("Button", "MPLCloseButton", frame, "UIPanelCloseButton"); frame.closeButton:ClearAllPoints(); diff --git a/locales/deDE.lua b/locales/deDE.lua index 630f952..6d91bae 100644 --- a/locales/deDE.lua +++ b/locales/deDE.lua @@ -48,7 +48,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" - +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General L["Item Slot"] = "Item Slot" diff --git a/locales/enUS.lua b/locales/enUS.lua index 0d355a1..38872f3 100644 --- a/locales/enUS.lua +++ b/locales/enUS.lua @@ -48,6 +48,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General diff --git a/locales/esES.lua b/locales/esES.lua index 5ef837b..b4bbb8a 100644 --- a/locales/esES.lua +++ b/locales/esES.lua @@ -48,7 +48,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" - +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General L["Item Slot"] = "Item Slot" diff --git a/locales/esMX.lua b/locales/esMX.lua index c19b802..0759225 100644 --- a/locales/esMX.lua +++ b/locales/esMX.lua @@ -48,7 +48,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" - +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General L["Item Slot"] = "Item Slot" diff --git a/locales/frFR.lua b/locales/frFR.lua index 33052f0..b39713a 100644 --- a/locales/frFR.lua +++ b/locales/frFR.lua @@ -48,7 +48,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" - +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General L["Item Slot"] = "Item Slot" diff --git a/locales/itIT.lua b/locales/itIT.lua index d355739..8effbc2 100644 --- a/locales/itIT.lua +++ b/locales/itIT.lua @@ -48,7 +48,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" - +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General L["Item Slot"] = "Item Slot" diff --git a/locales/koKR.lua b/locales/koKR.lua index 00b3cc2..bddfc2b 100644 --- a/locales/koKR.lua +++ b/locales/koKR.lua @@ -49,6 +49,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General L["Item Slot"] = "아이템 슬롯" diff --git a/locales/ptBR.lua b/locales/ptBR.lua index 35af190..973de45 100644 --- a/locales/ptBR.lua +++ b/locales/ptBR.lua @@ -48,7 +48,12 @@ L["Halls of Valor"] = "Halls of Valor" L["Court of Stars"] = "Court of Stars" L["Temple of the Jade Serpent"] = "Temple of the Jade Serpent" L["Shadowmoon Burial Grounds"] = "Shadowmoon Burial Grounds" - +L["Brackenhide Hollow"] = "Brackenhide Hollow" +L["Freehold"] = "Freehold" +L["Neltharion's Lair"] = "Neltharion's Lair" +L["Uldaman: Legacy of Tyr"] = "Uldaman: Legacy of Tyr" +L["The Underrot"] = "The Underrot" +L["The Vortex Pinnacle"] = "The Vortex Pinnacle" -- General L["Item Slot"] = "Item Slot" diff --git a/locales/ruRU.lua b/locales/ruRU.lua index c28d883..72539fb 100644 --- a/locales/ruRU.lua +++ b/locales/ruRU.lua @@ -50,6 +50,12 @@ L["Halls of Valor"] = "Чертоги Доблести" L["Court of Stars"] = "Квартал Звезд" L["Temple of the Jade Serpent"] = "Храм Нефритовой Змеи" L["Shadowmoon Burial Grounds"] = "Некрополь Призрачной Луны" +L["Brackenhide Hollow"] = "Ореховая лощина" +L["Freehold"] = "Право собственности" +L["Neltharion's Lair"] = "Логово Нелтариона" +L["Uldaman: Legacy of Tyr"] = "Ульдаман: Наследие Тира" +L["The Underrot"] = "Подгнилье" +L["The Vortex Pinnacle"] = "Вершина Вихря" -- General L["Item Slot"] = "Тип предмета" diff --git a/tables.lua b/tables.lua index 46470b9..4486fa8 100644 --- a/tables.lua +++ b/tables.lua @@ -55,14 +55,14 @@ MPL_tables.get_mythic_labels = get_mythic_labels local function get_dungeons() local dungeonTable = { - [L["Ruby Life Pools"]] = 1, - [L["The Nokhud Offensive"]] = 2, - [L["The Azure Vault"]] = 3, - [L["Algeth'ar Academy"]] = 4, - [L["Halls of Valor"]] = 5, - [L["Court of Stars"]] = 6, - [L["Temple of the Jade Serpent"]] = 7, - [L["Shadowmoon Burial Grounds"]] = 8, + [L["Brackenhide Hollow"]] = 1, + [L["Freehold"]] = 2, + [L["Halls of Infusion"]] = 3, + [L["The Underrot"]] = 4, + [L["Neltharus"]] = 5, + [L["Neltharion's Lair"]] = 6, + [L["Uldaman: Legacy of Tyr"]] = 7, + [L["The Vortex Pinnacle"]] = 8, } return dungeonTable @@ -71,14 +71,14 @@ MPL_tables.get_dungeons = get_dungeons local function dungeon_ids() local dungeonIDs = { - [L["Ruby Life Pools"]] = 1202, - [L["The Nokhud Offensive"]] = 1198, - [L["The Azure Vault"]] = 1203, - [L["Algeth'ar Academy"]] = 1201, - [L["Halls of Valor"]] = 721, - [L["Court of Stars"]] = 800, - [L["Temple of the Jade Serpent"]] = 313, - [L["Shadowmoon Burial Grounds"]] = 537, + [L["Brackenhide Hollow"]] = 1196, + [L["Freehold"]] = 1001, + [L["Halls of Infusion"]] = 1204, + [L["The Underrot"]] = 1022, + [L["Neltharus"]] = 1199, + [L["Neltharion's Lair"]] = 767, + [L["Uldaman: Legacy of Tyr"]] = 1197, + [L["The Vortex Pinnacle"]] = 68, } return dungeonIDs From 68ea4f634f67284d2dbc74a07d4a4bea2c688085 Mon Sep 17 00:00:00 2001 From: Dillonzer Date: Thu, 1 Jun 2023 21:45:01 -0600 Subject: [PATCH 2/2] Adding IconTexture --- MythicPlusLoot.toc | 1 + 1 file changed, 1 insertion(+) diff --git a/MythicPlusLoot.toc b/MythicPlusLoot.toc index 989db05..66bd1b4 100644 --- a/MythicPlusLoot.toc +++ b/MythicPlusLoot.toc @@ -5,6 +5,7 @@ ## Notes: Gear scaling for mythic+ dungeons. ## Notes-ruRU: Скалирование снаряжения для М+ подземелий. ## SavedVariables: MythicPlusLootDB +## IconTexture: Interface\AddOns\MythicPlusLoot\textures\icon.tga libs\load_libs.xml init.lua