From 0573d179aa1b0c961789e035a822ac73633d4228 Mon Sep 17 00:00:00 2001 From: D4KiR <23246564+d4kir92@users.noreply.github.com> Date: Fri, 21 Jun 2024 13:56:38 +0200 Subject: [PATCH] v0.9.73 --- ImproveAny.toc | 2 +- ImproveAny_Cata.toc | 2 +- ImproveAny_TBC.toc | 2 +- ImproveAny_Vanilla.toc | 2 +- ImproveAny_Wrath.toc | 2 +- core.lua | 44 ++++++++++++++++----------------- ele/bags.lua | 4 +-- ele/castbar.lua | 4 +-- ele/chat.lua | 10 ++++---- ele/ilvlbar.lua | 4 +-- ele/itemlevel.lua | 25 +++++++++++-------- ele/minimap.lua | 10 ++++---- ele/moneybar.lua | 4 +-- ele/raidframe.lua | 4 +-- ele/repbar.lua | 2 +- ele/skillbars.lua | 6 ++--- ele/tokenbar.lua | 41 ++++++++++++++++-------------- ele/worldmapframe.lua | 6 ++--- ele/xpbar.lua | 12 ++++----- libs/D4Lib/D4DB.lua | 14 ++++------- libs/D4Lib/D4Frames.lua | 10 +++----- libs/D4Lib/D4Grid.lua | 6 +---- libs/D4Lib/D4Lib.lua | 22 +++++++---------- libs/D4Lib/D4Math.lua | 6 +---- libs/D4Lib/D4MinimapButtons.lua | 6 +---- libs/D4Lib/D4Output.lua | 17 ++++++------- libs/D4Lib/D4SlashCmds.lua | 12 +++------ libs/D4Lib/D4Translations.lua | 12 +++------ libs/D4Lib/D4Versions.lua | 24 +++++++----------- libs/math.lua | 1 + settings.lua | 11 +++++---- 31 files changed, 149 insertions(+), 178 deletions(-) diff --git a/ImproveAny.toc b/ImproveAny.toc index 94434c7..7402cf1 100644 --- a/ImproveAny.toc +++ b/ImproveAny.toc @@ -4,7 +4,7 @@ ## Interface-Cata: 40400 ## Interface: 100207, 110000 -## Version: 0.9.72 +## Version: 0.9.73 ## Title: ImproveAny by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Improve Any Ui or Frame ## Author: D4KiR diff --git a/ImproveAny_Cata.toc b/ImproveAny_Cata.toc index 6f869e0..3e898bd 100644 --- a/ImproveAny_Cata.toc +++ b/ImproveAny_Cata.toc @@ -1,5 +1,5 @@ ## Interface: 40400 -## Version: 0.9.72 +## Version: 0.9.73 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Improve Any Ui or Frame ## Author: D4KiR diff --git a/ImproveAny_TBC.toc b/ImproveAny_TBC.toc index f2784f2..2440eb2 100644 --- a/ImproveAny_TBC.toc +++ b/ImproveAny_TBC.toc @@ -1,5 +1,5 @@ ## Interface: 20504 -## Version: 0.9.72 +## Version: 0.9.73 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Improve Any Ui or Frame ## Author: D4KiR diff --git a/ImproveAny_Vanilla.toc b/ImproveAny_Vanilla.toc index 960e7c7..2f50afc 100644 --- a/ImproveAny_Vanilla.toc +++ b/ImproveAny_Vanilla.toc @@ -1,5 +1,5 @@ ## Interface: 11502 -## Version: 0.9.72 +## Version: 0.9.73 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Improve Any Ui or Frame ## Author: D4KiR diff --git a/ImproveAny_Wrath.toc b/ImproveAny_Wrath.toc index ebe3b08..77181f6 100644 --- a/ImproveAny_Wrath.toc +++ b/ImproveAny_Wrath.toc @@ -1,5 +1,5 @@ ## Interface: 30403 -## Version: 0.9.72 +## Version: 0.9.73 ## Title: ImproveAny |T136033:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Improve Any Ui or Frame ## Author: D4KiR diff --git a/core.lua b/core.lua index f4f2157..42e4235 100644 --- a/core.lua +++ b/core.lua @@ -155,7 +155,7 @@ local warningEnhanceTrainers = false function ImproveAny:Event(event, ...) if ImproveAny.Setup == nil then ImproveAny.Setup = true - if D4:IsAddOnLoaded("D4KiR MoveAndImprove") then + if ImproveAny:IsAddOnLoaded("D4KiR MoveAndImprove") then ImproveAny:MSG("DON'T use MoveAndImprove, when you use ImproveAny") end @@ -204,7 +204,7 @@ function ImproveAny:Event(event, ...) ImproveAny:UpdateStatusBar() ImproveAny:InitIAPingFrame() ImproveAny:InitIACoordsFrame() - if D4:GetWoWBuild() ~= "RETAIL" then + if ImproveAny:GetWoWBuild() ~= "RETAIL" then ImproveAny:InitSpellBookFix() end @@ -220,9 +220,9 @@ function ImproveAny:Event(event, ...) function ImproveAny:UpdateMinimapButton() if ImproveAny:IsEnabled("SHOWMINIMAPBUTTON", true) then - D4:ShowMMBtn("ImproveAny") + ImproveAny:ShowMMBtn("ImproveAny") else - D4:HideMMBtn("ImproveAny") + ImproveAny:HideMMBtn("ImproveAny") end end @@ -239,7 +239,7 @@ function ImproveAny:Event(event, ...) end local mmbtn = nil - D4:CreateMinimapButton( + ImproveAny:CreateMinimapButton( { ["name"] = "ImproveAny", ["icon"] = 136033, @@ -250,8 +250,8 @@ function ImproveAny:Event(event, ...) ImproveAny:ToggleSettings() end, ["funcR"] = function() - D4:MSG("ImproveAny", 132117, "Minimap Button is now hidden.") - D4:HideMMBtn("ImproveAny") + ImproveAny:MSG("ImproveAny", 132117, "Minimap Button is now hidden.") + ImproveAny:HideMMBtn("ImproveAny") end, } ) @@ -391,14 +391,14 @@ function ImproveAny:Event(event, ...) end if itemId then - local _, _, _, _, _, _, _, itemStackCount, _, _, price, _, _, _, expacID, _, _ = D4:GetItemInfo(itemId) + local _, _, _, _, _, _, _, itemStackCount, _, _, price, _, _, _, expacID, _, _ = ImproveAny:GetItemInfo(itemId) if expacID and ImproveAny:IsEnabled("TOOLTIPEXPANSION", false) then local textcolor = "|cFFFF1111" if expacID >= GetExpansionLevel() then textcolor = "|cFF11FF11" end - if D4:GetWoWBuild() == "RETAIL" and expacID < GetExpansionLevel() then + if ImproveAny:GetWoWBuild() == "RETAIL" and expacID < GetExpansionLevel() then tt:AddDoubleLine(ImproveAny:GT("ADDEDIN"), format(ImproveAny:GT("EXPANSION"), textcolor, _G["EXPANSION_NAME" .. expacID])) end end @@ -444,7 +444,7 @@ function ImproveAny:Event(event, ...) if itemLink then local itemId = tonumber(strmatch(itemLink, "item:(%d*)")) if itemId then - local _, _, _, _, _, _, _, itemStackCount, _, _, price, _, _, _, _, _, _ = D4:GetItemInfo(itemId) + local _, _, _, _, _, _, _, itemStackCount, _, _, price, _, _, _, _, _, _ = ImproveAny:GetItemInfo(itemId) if price and tt.shownMoneyFrames == nil and price > 0 and GetItemCount and GetCoinTextureString then local count = GetItemCount(itemId) if ImproveAny:IsEnabled("TOOLTIPSELLPRICE", false) then @@ -494,7 +494,7 @@ function ImproveAny:Event(event, ...) end ) - if D4:GetWoWBuild() ~= "RETAIL" and ImproveAny:IsEnabled("WIDEFRAMES", false) then + if ImproveAny:GetWoWBuild() ~= "RETAIL" and ImproveAny:IsEnabled("WIDEFRAMES", false) then if not warningEnhanceDressup and LeaPlusDB and LeaPlusDB["EnhanceDressup"] and LeaPlusDB["EnhanceDressup"] == "On" then ImproveAny:MSG("LeatrixPlus \"EnhanceDressup\" is enabled, may break WideFrames") warningEnhanceDressup = true @@ -510,7 +510,7 @@ function ImproveAny:Event(event, ...) warningEnhanceTrainers = true end - if D4:GetWoWBuild() == "CLASSIC" then + if ImproveAny:GetWoWBuild() == "CLASSIC" then local tall, numTallQuests = 74, 22 UIPanelWindows["QuestLogFrame"] = { area = "override", @@ -648,7 +648,7 @@ function ImproveAny:Event(event, ...) local regions = {_G["TradeSkillFrame"]:GetRegions()} for i, v in pairs(regions) do if i > 1 then - if D4:GetWoWBuild() == "CLASSIC" then + if ImproveAny:GetWoWBuild() == "CLASSIC" then if i == 2 then regions[i]:SetSize(1024, 512) regions[i]:SetTexture("Interface\\AddOns\\ImproveAny\\media\\wideframe") @@ -696,7 +696,7 @@ function ImproveAny:Event(event, ...) TradeSkillInvSlotDropDown:SetPoint("TOPLEFT", TradeSkillFrame, "TOPLEFT", 510, -40) TradeSkillSubClassDropDown:ClearAllPoints() TradeSkillSubClassDropDown:SetPoint("RIGHT", TradeSkillInvSlotDropDown, "LEFT", 0, 0) - if D4:IsAddOnLoaded("ClassicProfessionFilter") and TradeSkillFrame.SearchBox and TradeSkillFrame.HaveMats and TradeSkillFrame.HaveMats.text and D4:GetWoWBuild() ~= "RETAIL" and D4:GetWoWBuild() ~= "CATA" then + if ImproveAny:IsAddOnLoaded("ClassicProfessionFilter") and TradeSkillFrame.SearchBox and TradeSkillFrame.HaveMats and TradeSkillFrame.HaveMats.text and ImproveAny:GetWoWBuild() ~= "RETAIL" and ImproveAny:GetWoWBuild() ~= "CATA" then TradeSkillFrame.SearchBox:ClearAllPoints() TradeSkillFrame.SearchBox:SetPoint("LEFT", TradeSkillRankFrame, "RIGHT", 20, -10) TradeSkillFrame.HaveMats:ClearAllPoints() @@ -723,7 +723,7 @@ function ImproveAny:Event(event, ...) end end - if D4:IsAddOnLoaded("Blizzard_TradeSkillUI") then + if ImproveAny:IsAddOnLoaded("Blizzard_TradeSkillUI") then TradeSkillFunc("TradeSkill") else local waitFrame = CreateFrame("FRAME") @@ -848,7 +848,7 @@ function ImproveAny:Event(event, ...) end ) - if D4:IsAddOnLoaded("ClassicProfessionFilter") and CraftFrame.SearchBox and CraftFrame.HaveMats and CraftFrame.HaveMats.text and CraftFrame.SearchMats and CraftFrame.SearchMats.text then + if ImproveAny:IsAddOnLoaded("ClassicProfessionFilter") and CraftFrame.SearchBox and CraftFrame.HaveMats and CraftFrame.HaveMats.text and CraftFrame.SearchMats and CraftFrame.SearchMats.text then CraftFrame.SearchBox:ClearAllPoints() CraftFrame.SearchBox:SetPoint("LEFT", CraftRankFrame, "RIGHT", 20, -10) CraftFrame.HaveMats:ClearAllPoints() @@ -875,7 +875,7 @@ function ImproveAny:Event(event, ...) end end - if D4:IsAddOnLoaded("Blizzard_CraftUI") then + if ImproveAny:IsAddOnLoaded("Blizzard_CraftUI") then CraftFunc() else local waitFrame = CreateFrame("FRAME") @@ -998,7 +998,7 @@ function ImproveAny:Event(event, ...) ClassTrainerGreetingText:Hide() end - if D4:IsAddOnLoaded("Blizzard_TrainerUI") then + if ImproveAny:IsAddOnLoaded("Blizzard_TrainerUI") then TrainerFunc() else local waitFrame = CreateFrame("FRAME") @@ -1016,9 +1016,9 @@ function ImproveAny:Event(event, ...) end end - if D4:GetWoWBuild() == "CLASSIC" then + if ImproveAny:GetWoWBuild() == "CLASSIC" and ImproveAny:IsEnabled("IMPROVETRADESKILLFRAME", false) then local function InitTSF() - if D4:GetWoWBuild() == "CLASSIC" then + if ImproveAny:GetWoWBuild() == "CLASSIC" then TradeSkillFrame.hasMaterial = CreateFrame("CheckButton", "HasMaterial", TradeSkillFrame, "UICheckButtonTemplate") TradeSkillFrame.hasMaterial:SetSize(20, 20) TradeSkillFrame.hasMaterial:SetPoint("TOPLEFT", TradeSkillFrame, "TOPLEFT", 70, -54) @@ -1038,7 +1038,7 @@ function ImproveAny:Event(event, ...) TradeSkillFrame.hasSkillUp = CreateFrame("CheckButton", "HasSkillUp", TradeSkillFrame, "UICheckButtonTemplate") TradeSkillFrame.hasSkillUp:SetSize(20, 20) - if D4:GetWoWBuild() == "CLASSIC" then + if ImproveAny:GetWoWBuild() == "CLASSIC" then TradeSkillFrame.hasSkillUp:SetPoint("TOPLEFT", TradeSkillFrame, "TOPLEFT", 210, -54) else TradeSkillFrame.hasSkillUp:SetPoint("TOPLEFT", TradeSkillFrame, "TOPLEFT", 210, -15) @@ -1136,7 +1136,7 @@ function ImproveAny:Event(event, ...) ) end - if D4:IsAddOnLoaded("Blizzard_TradeSkillUI") then + if ImproveAny:IsAddOnLoaded("Blizzard_TradeSkillUI") then InitTSF() else local waitFrame = CreateFrame("FRAME") diff --git a/ele/bags.lua b/ele/bags.lua index a637d72..381c34b 100644 --- a/ele/bags.lua +++ b/ele/bags.lua @@ -122,12 +122,12 @@ function ImproveAny:InitBags() end IABagBar = CreateFrame("FRAME", "IABagBar", BagsBar or UIParent) - if D4:IsAddOnLoaded("Dominos") and ImproveAny:GV("BAGMODE", "RETAIL") ~= "DISABLED" then + if ImproveAny:IsAddOnLoaded("Dominos") and ImproveAny:GV("BAGMODE", "RETAIL") ~= "DISABLED" then ImproveAny:MSG(format("Dominos is enabled, BAGMODE: %s may can break Domonis moving the bag bar.", ImproveAny:GV("BAGMODE", "RETAIL"))) end if ImproveAny:GV("BAGMODE", "RETAIL") == "RETAIL" then - if D4:GetWoWBuild() ~= "RETAIL" and BagsBar then + if ImproveAny:GetWoWBuild() ~= "RETAIL" and BagsBar then BagToggle = CreateFrame("BUTTON", "BagToggle", BagsBar or UIParent) local mainBag = _G["MainMenuBarBackpackButton"] if mainBag then diff --git a/ele/castbar.lua b/ele/castbar.lua index ab0ef60..1b668a6 100644 --- a/ele/castbar.lua +++ b/ele/castbar.lua @@ -72,7 +72,7 @@ function ImproveAny:InitCastBar() name, _, texture = ChannelInfo() end - if D4:GetWoWBuild() ~= "RETAIL" and texture == 136235 then + if ImproveAny:GetWoWBuild() ~= "RETAIL" and texture == 136235 then texture = 136243 -- 136192 end @@ -104,4 +104,4 @@ function ImproveAny:InitCastBar() ImproveAny:UpdateCastbarTimer() end end -end \ No newline at end of file +end diff --git a/ele/chat.lua b/ele/chat.lua index c358614..608b398 100644 --- a/ele/chat.lua +++ b/ele/chat.lua @@ -4,7 +4,7 @@ local classes = {} C_Timer.After( 0.01, function() - if D4:GetWoWBuild() == "CLASSIC" then + if ImproveAny:GetWoWBuild() == "CLASSIC" then races["Troll2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:256:256:128:192:64:128|t" races["NightElf3"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:256:256:192:256:128:192|t" races["Human2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:256:256:0:64:0:64|t" @@ -21,7 +21,7 @@ C_Timer.After( races["Scourge2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:256:256:64:128:64:128|t" races["Tauren2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:256:256:0:64:64:128|t" races["Dwarf2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:256:256:64:128:0:64|t" - elseif D4:GetWoWBuild() == "TBC" or D4:GetWoWBuild() == "WRATH" then + elseif ImproveAny:GetWoWBuild() == "TBC" or ImproveAny:GetWoWBuild() == "WRATH" then races["Troll2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:512:256:128:192:64:128|t" races["Scourge2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:512:256:64:128:64:128|t" races["Tauren3"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:512:256:0:64:192:256|t" @@ -42,7 +42,7 @@ C_Timer.After( races["Draenei2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:512:256:256:320:0:64|t" races["Orc2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:512:256:192:256:64:128|t" races["Dwarf2"] = "|TInterface\\Glues\\CharacterCreate\\UI-CharacterCreate-Races:0:0:0:0:512:256:64:128:0:64|t" - elseif D4:GetWoWBuild() == "RETAIL" then + elseif ImproveAny:GetWoWBuild() == "RETAIL" then races["Human2"] = "|TInterface\\Glues\\CharacterCreate\\CharacterCreateIcons:0:0:0:0:2048:1024:1170:1235:262:327|t" races["Human3"] = "|TInterface\\Glues\\CharacterCreate\\CharacterCreateIcons:0:0:0:0:2048:1024:1170:1235:196:261|t" races["Orc2"] = "|TInterface\\Glues\\CharacterCreate\\CharacterCreateIcons:0:0:0:0:2048:1024:1434:1499:196:261|t" @@ -469,7 +469,7 @@ function ImproveAny:InitChat() local typ, id = string.match(itemString, "|H(.-):(.-)|h") if typ == "item" then id = string.match(id, "(%d+)") - local itemName, _, _, _, _, _, _, _, _, itemTexture = D4:GetItemInfo(id) + local itemName, _, _, _, _, _, _, _, _, itemTexture = ImproveAny:GetItemInfo(id) if itemName and itemTexture then if ImproveAny:IsEnabled("CHATITEMICONS", false) then return "|T" .. itemTexture .. ":0|t" .. itemString @@ -621,7 +621,7 @@ function ImproveAny:InitChat() hasEditBox = true } - if D4:GetWoWBuild() == "RETAIL" then + if ImproveAny:GetWoWBuild() == "RETAIL" then hooksecurefunc( ItemRefTooltip, "SetHyperlink", diff --git a/ele/ilvlbar.lua b/ele/ilvlbar.lua index 00f0f48..e862eb5 100644 --- a/ele/ilvlbar.lua +++ b/ele/ilvlbar.lua @@ -16,7 +16,7 @@ function ImproveAny:InitIAILVLBar() IAILVLBar.textilvlequipped:SetTextColor(1.0, 1.0, 0.1) function IAILVLBar.Think() if IAILVLBar.textilvloverall and IAILVLBar.textilvlequipped then - local overall, equipped = IAILVL, IAILVL + local overall, equipped = ImproveAny:GetIAILVL(), ImproveAny:GetIAILVL() if GetAverageItemLevel then overall, equipped = GetAverageItemLevel() overall = string.format("%.2f", overall) @@ -50,4 +50,4 @@ function ImproveAny:InitIAILVLBar() IAILVLBar.Think() end -end \ No newline at end of file +end diff --git a/ele/itemlevel.lua b/ele/itemlevel.lua index 5408da9..d32e9a9 100644 --- a/ele/itemlevel.lua +++ b/ele/itemlevel.lua @@ -41,6 +41,11 @@ function ImproveAny:AddIlvl(SLOT, i) end local PDThink = CreateFrame("FRAME") +local IAILVL = nil +function ImproveAny:GetIAILVL() + return IAILVL +end + function ImproveAny:PDUpdateItemInfos() if ImproveAny:IsEnabled("ITEMLEVELSYSTEM", false) then local count = 0 @@ -51,7 +56,7 @@ function ImproveAny:PDUpdateItemInfos() if SLOT and SLOT.iatext ~= nil and GetInventoryItemLink and SLOT.GetID and SLOT:GetID() then local ItemID = GetInventoryItemLink("PLAYER", SLOT:GetID()) or GetInventoryItemID("PLAYER", SLOT:GetID()) if ItemID ~= nil and GetDetailedItemLevelInfo then - local _, _, rarity = D4:GetItemInfo(ItemID) + local _, _, rarity = ImproveAny:GetItemInfo(ItemID) local ilvl, _, _ = GetDetailedItemLevelInfo(ItemID) local color = ITEM_QUALITY_COLORS[rarity] local current, maximum = GetInventoryItemDurability(i) @@ -136,21 +141,21 @@ function ImproveAny:PDUpdateItemInfos() if count > 0 then local max = 16 -- when only IAnhand if GetInventoryItemID("PLAYER", 17) then - local t1 = D4:GetItemInfo(GetInventoryItemLink("PLAYER", 17)) + local t1 = ImproveAny:GetItemInfo(GetInventoryItemLink("PLAYER", 17)) -- when 2x 1handed if t1 then max = 17 end end - if D4:GetWoWBuild() == "RETAIL" then + if ImproveAny:GetWoWBuild() == "RETAIL" then max = max - 1 end IAILVL = string.format("%0.2f", sum / max) if PaperDollFrame.ilvl then if true then - PaperDollFrame.ilvl:SetText("|cFFFFFF00" .. ITEM_LEVEL_ABBR .. ": |r" .. IAILVL) + PaperDollFrame.ilvl:SetText("|cFFFFFF00" .. ITEM_LEVEL_ABBR .. ": |r" .. ImproveAny:GetIAILVL()) else PaperDollFrame.ilvl:SetText("") end @@ -226,7 +231,7 @@ function ImproveAny:InitItemLevel() if SLOT and SLOT.iatext ~= nil and GetInventoryItemLink then local ItemID = GetInventoryItemLink("TARGET", SLOT:GetID()) --GetInventoryItemID("PLAYER", SLOT:GetID()) if ItemID and GetDetailedItemLevelInfo then - local _, _, rarity = D4:GetItemInfo(ItemID) + local _, _, rarity = ImproveAny:GetItemInfo(ItemID) local ilvl, _, _ = GetDetailedItemLevelInfo(ItemID) local color = ITEM_QUALITY_COLORS[rarity] if ImproveAny:IsEnabled("ITEMLEVEL", false) and ilvl and color then @@ -270,14 +275,14 @@ function ImproveAny:InitItemLevel() local max = 16 -- when only IAnhand local ItemID = GetInventoryItemLink("TARGET", 17) if GetItemInfo and GetInventoryItemID and ItemID ~= nil then - local t1 = D4:GetItemInfo(ItemID) + local t1 = ImproveAny:GetItemInfo(ItemID) -- when 2x 1handed if t1 then max = 17 end end - if D4:GetWoWBuild() == "RETAIL" then + if ImproveAny:GetWoWBuild() == "RETAIL" then max = max - 1 end @@ -351,7 +356,7 @@ function ImproveAny:InitItemLevel() local slotLink = ImproveAny:GetContainerItemLink(bagID, slotID) ImproveAny:AddIlvl(SLOT, slotID) if slotLink and GetDetailedItemLevelInfo then - local _, _, rarity, _, _, _, _, _, _, _, _, classID, subclassID = D4:GetItemInfo(slotLink) + local _, _, rarity, _, _, _, _, _, _, _, _, classID, subclassID = ImproveAny:GetItemInfo(slotLink) local ilvl, _, _ = GetDetailedItemLevelInfo(slotLink) local color = ITEM_QUALITY_COLORS[rarity] if ilvl and color then @@ -442,9 +447,9 @@ function ImproveAny:InitItemLevel() ImproveAny:UpdateBagsIlvl() end - if D4:GetWoWBuild() ~= "RETAIL" and BagItemSearchBox == nil and BagItemAutoSortButton == nil then + if ImproveAny:GetWoWBuild() ~= "RETAIL" and BagItemSearchBox == nil and BagItemAutoSortButton == nil then -- Bag Searchbar - if not D4:IsOldWow() then + if not ImproveAny:IsOldWow() then for i = 1, 6 do local cf = _G["ContainerFrame" .. i] if cf then diff --git a/ele/minimap.lua b/ele/minimap.lua index 4e54a59..35d0e8b 100644 --- a/ele/minimap.lua +++ b/ele/minimap.lua @@ -203,7 +203,7 @@ function ImproveAny:InitMinimap() IAMMBtnsFrame.hide = true if ImproveAny:IsEnabled("COMBINEMMBTNS", false) then local mmbtn = nil - D4:CreateMinimapButton( + ImproveAny:CreateMinimapButton( { ["name"] = "ImproveAnyMMBtns", ["icon"] = 1120721, @@ -288,7 +288,7 @@ function ImproveAny:InitMinimap() btn:SetMovable(true) btn:SetUserPlaced(false) local radius = 80 - if D4:GetWoWBuild() == "RETAIL" then + if ImproveAny:GetWoWBuild() == "RETAIL" then radius = 110 end @@ -421,7 +421,7 @@ function ImproveAny:InitMinimap() MinimapToggleButton:Hide() end - if D4:GetWoWBuild() ~= "RETAIL" and TimeManagerClockButton then + if ImproveAny:GetWoWBuild() ~= "RETAIL" and TimeManagerClockButton then local clocktexture = select(1, TimeManagerClockButton:GetRegions()) if clocktexture and clocktexture.SetTexture then clocktexture:SetTexture(nil) @@ -478,7 +478,7 @@ function ImproveAny:InitMinimap() end if select(4, GetBuildInfo()) < 100000 then - ImproveAny:ConvertToMinimapButton("GameTimeFrame", true, D4:GetWoWBuild() == "CLASSIC") -- Calendar + ImproveAny:ConvertToMinimapButton("GameTimeFrame", true, ImproveAny:GetWoWBuild() == "CLASSIC") -- Calendar end ImproveAny:ConvertToMinimapButton("ExpansionLandingPageMinimapButton", true) -- Sanctum @@ -523,4 +523,4 @@ function ImproveAny:InitMinimap() end ) end -end \ No newline at end of file +end diff --git a/ele/moneybar.lua b/ele/moneybar.lua index 93158ec..bbaf270 100644 --- a/ele/moneybar.lua +++ b/ele/moneybar.lua @@ -84,10 +84,10 @@ function ImproveAny:InitMoneyBar() end IAMoneyBar:MoneyThink() - if D4:GetWoWBuild() ~= "RETAIL" and (GOLD_AMOUNT_SYMBOL == nil or GOLD_AMOUNT_SYMBOL == "G") then + if ImproveAny:GetWoWBuild() ~= "RETAIL" and (GOLD_AMOUNT_SYMBOL == nil or GOLD_AMOUNT_SYMBOL == "G") then GOLD_AMOUNT_SYMBOL = "|TInterface\\MoneyFrame\\UI-GoldIcon:12:12:2:0|t" SILVER_AMOUNT_SYMBOL = "|TInterface\\MoneyFrame\\UI-SilverIcon:12:12:2:0|t" COPPER_AMOUNT_SYMBOL = "|TInterface\\MoneyFrame\\UI-CopperIcon:12:12:2:0|t" end end -end \ No newline at end of file +end diff --git a/ele/raidframe.lua b/ele/raidframe.lua index 7b9cefb..e89414e 100644 --- a/ele/raidframe.lua +++ b/ele/raidframe.lua @@ -1,6 +1,6 @@ local _, ImproveAny = ... function ImproveAny:InitRaidFrames() - if D4:GetWoWBuild() ~= "RETAIL" then + if ImproveAny:GetWoWBuild() ~= "RETAIL" then local raidFrames = {} function ImproveAny:IsCompactRaidFrame(frame) if frame == nil then return false end @@ -423,4 +423,4 @@ function ImproveAny:InitRaidFrames() end end end -end \ No newline at end of file +end diff --git a/ele/repbar.lua b/ele/repbar.lua index b87d768..24cd0e4 100644 --- a/ele/repbar.lua +++ b/ele/repbar.lua @@ -23,7 +23,7 @@ C_Timer.After( ) if ImproveAny:IsEnabled("REPHIDEARTWORK", false) then - if not D4:IsAddOnLoaded("MoveAny") then + if not ImproveAny:IsAddOnLoaded("MoveAny") then hooksecurefunc( ReputationWatchBar, "SetHeight", diff --git a/ele/skillbars.lua b/ele/skillbars.lua index efff64f..bff07f5 100644 --- a/ele/skillbars.lua +++ b/ele/skillbars.lua @@ -60,7 +60,7 @@ function ImproveAny:GetWeaponSkillData(id) if subTypes[item] then itemname, itemcur, itemmax = ImproveAny:GetSkillData(subTypes[item]) else - local _, _, _, _, _, _, itemSubType = D4:GetItemInfo(item) + local _, _, _, _, _, _, itemSubType = ImproveAny:GetItemInfo(item) if itemSubType then if AUCTION_SUBCATEGORY_ONE_HANDED then local s1, e1 = string.find(itemSubType, AUCTION_SUBCATEGORY_ONE_HANDED, 1, true) @@ -178,12 +178,12 @@ function ImproveAny:AddStatusBar(func, args) end function ImproveAny:InitSkillBars() - if D4:GetWoWBuild() ~= "RETAIL" and ImproveAny:IsEnabled("SKILLBARS", false) then + if ImproveAny:GetWoWBuild() ~= "RETAIL" and ImproveAny:IsEnabled("SKILLBARS", false) then IASkills = CreateFrame("FRAME", "IASkills", UIParent) IASkills:SetPoint("TOPLEFT", UIParent, "TOPLEFT", 520, 0) IASkills:SetSize(sw, 6 * sh) IASkills.bars = {} - if D4:GetWoWBuildNr() < 40000 then + if ImproveAny:GetWoWBuildNr() < 40000 then ImproveAny:AddStatusBar(ImproveAny.GetWeaponSkillData, 16) ImproveAny:AddStatusBar(ImproveAny.GetWeaponSkillData, 17) ImproveAny:AddStatusBar(ImproveAny.GetWeaponSkillData, 18) diff --git a/ele/tokenbar.lua b/ele/tokenbar.lua index 8fe40f3..3f34a01 100644 --- a/ele/tokenbar.lua +++ b/ele/tokenbar.lua @@ -1,10 +1,8 @@ local _, ImproveAny = ... local tab = {} - function ImproveAny:GetTokenList() tab = {} local max = 1 - if GetCurrencyListSize then max = GetCurrencyListSize() elseif C_CurrencyInfo.GetCurrencyListSize then @@ -13,9 +11,8 @@ function ImproveAny:GetTokenList() for index = 1, max do local name, _, _, _, isWatched, count, icon, _, _, _ = nil - if GetCurrencyListInfo then - name, _, _, _, isWatched, count, icon, maxCount, _, _ = GetCurrencyListInfo(index) + name, _, _, _, isWatched, count, icon, _, _, _ = GetCurrencyListInfo(index) elseif C_CurrencyInfo.GetCurrencyListInfo then info = C_CurrencyInfo.GetCurrencyListInfo(index) name = info.name @@ -26,11 +23,14 @@ function ImproveAny:GetTokenList() if name then if isWatched then - tinsert(tab, { - ["name"] = name, - ["count"] = count, - ["icon"] = icon - }) + tinsert( + tab, + { + ["name"] = name, + ["count"] = count, + ["icon"] = icon + } + ) end else break @@ -39,7 +39,6 @@ function ImproveAny:GetTokenList() if IATokenBar and IATokenBar.text then local text = "" - for i, token in pairs(tab) do if text ~= "" then text = text .. " " @@ -53,7 +52,6 @@ function ImproveAny:GetTokenList() end IATokenBar = CreateFrame("FRAME", "IATokenBar", UIParent) - function ImproveAny:InitTokenBar() if ImproveAny:IsEnabled("TOKENBAR", false) then IATokenBar:SetSize(180, 20) @@ -64,17 +62,22 @@ function ImproveAny:InitTokenBar() IATokenBar.text:SetPoint("CENTER", IATokenBar, "CENTER", 0, 0) IATokenBar.text:SetText("ImproveAny - Tokenbar") IATokenBar:RegisterEvent("CURRENCY_DISPLAY_UPDATE") - - IATokenBar:SetScript("OnEvent", function(sel, ...) - ImproveAny:GetTokenList() - end) + IATokenBar:SetScript( + "OnEvent", + function(sel, ...) + ImproveAny:GetTokenList() + end + ) if TokenFrame_Update then - hooksecurefunc("TokenFrame_Update", function() - ImproveAny:GetTokenList() - end) + hooksecurefunc( + "TokenFrame_Update", + function() + ImproveAny:GetTokenList() + end + ) end ImproveAny:GetTokenList() end -end \ No newline at end of file +end diff --git a/ele/worldmapframe.lua b/ele/worldmapframe.lua index fdd1498..c9b4a67 100644 --- a/ele/worldmapframe.lua +++ b/ele/worldmapframe.lua @@ -22,11 +22,11 @@ end function ImproveAny:InitWorldMapFrame() fontsize = ImproveAny:GV("COORDSFONTSIZE", 10) - if WorldMapFrame and D4:GetWoWBuild() ~= "RETAIL" then + if WorldMapFrame and ImproveAny:GetWoWBuild() ~= "RETAIL" then WorldMapFrame.ScrollContainer.GetCursorPosition = function(fr) local x, y = MapCanvasScrollControllerMixin.GetCursorPosition(fr) local scale = WorldMapFrame:GetScale() - if not D4:IsAddOnLoaded("Mapster") and not D4:IsAddOnLoaded("GW2_UI") then + if not ImproveAny:IsAddOnLoaded("Mapster") and not ImproveAny:IsAddOnLoaded("GW2_UI") then return x / scale, y / scale else local reverseEffectiveScale = 1 / UIParent:GetEffectiveScale() @@ -120,7 +120,7 @@ function ImproveAny:InitWorldMapFrame() local w, h = WorldMapFrame.ScrollContainer:GetSize() if x and y then local scale = WorldMapFrame.ScrollContainer.Child:GetScale() - if D4:GetWoWBuild() == "RETAIL" then + if ImproveAny:GetWoWBuild() == "RETAIL" then scale = 1 + WorldMapFrame:GetCanvasZoomPercent() end diff --git a/ele/xpbar.lua b/ele/xpbar.lua index 641df0d..25fb01f 100644 --- a/ele/xpbar.lua +++ b/ele/xpbar.lua @@ -120,7 +120,7 @@ function ImproveAny:UpdateQuestFrame() local questIndex = i + FauxScrollFrame_GetOffset(_G["QuestLogListScrollFrame"]) local questNormalText = nil local questLogTitleText, lvl, questTag, isHeader, _, isComplete, _, questID = GetQuestLogTitle(questIndex) - local rewardXP = IAGetQuestLogRewardXP(questID) + local rewardXP = ImproveAny:GetQuestLogRewardXP(questID) if not isHeader and rewardXP then local questTitleTag = _G["QuestLogTitle" .. i .. "Tag"] local questTitleCheck = _G["QuestLogTitle" .. i .. "Check"] @@ -257,7 +257,7 @@ function ImproveAny:InitXPBar() end ImproveAny:UpdateQAF() - function IAGetQuestLogRewardXP(questID) + function ImproveAny:GetQuestLogRewardXP(questID) if questID == nil then return nil end IATAB["QUESTS"] = IATAB["QUESTS"] or {} if IATAB["QUESTS"][questID] ~= nil then return IATAB["QUESTS"][questID] end @@ -277,7 +277,7 @@ function ImproveAny:InitXPBar() end end - if D4:GetWoWBuild() == "CLASSIC" then + if ImproveAny:GetWoWBuild() == "CLASSIC" then hooksecurefunc( "QuestLog_Update", function() @@ -286,11 +286,11 @@ function ImproveAny:InitXPBar() ) end - if D4:GetWoWBuild() == "TBC" then + if ImproveAny:GetWoWBuild() == "TBC" then maxlevel = 70 end - if D4:GetWoWBuild() == "WRATH" then + if ImproveAny:GetWoWBuild() == "WRATH" then maxlevel = 80 end @@ -299,7 +299,7 @@ function ImproveAny:InitXPBar() end if MainMenuExpBar then - if not D4:IsAddOnLoaded("MoveAny") then + if not ImproveAny:IsAddOnLoaded("MoveAny") then MainMenuExpBar:SetHeight(15) end diff --git a/libs/D4Lib/D4DB.lua b/libs/D4Lib/D4DB.lua index 07d9236..d661d96 100644 --- a/libs/D4Lib/D4DB.lua +++ b/libs/D4Lib/D4DB.lua @@ -1,17 +1,13 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... function D4:GV(db, key, value) if db == nil then - D4:msg("[D4:GV] db is nil", "db", tostring(db), "key", tostring(key), "value", tostring(value)) + D4:MSG("[D4:GV] db is nil", "db", tostring(db), "key", tostring(key), "value", tostring(value)) return value end if type(db) ~= "table" then - D4:msg("[D4:GV] db is not table", "db", tostring(db), "key", tostring(key), "value", tostring(value)) + D4:MSG("[D4:GV] db is not table", "db", tostring(db), "key", tostring(key), "value", tostring(value)) return value end @@ -23,13 +19,13 @@ end function D4:SV(db, key, value) if db == nil then - D4:msg("[D4:SV] db is nil", "db", tostring(db), "key", tostring(key), "value", tostring(value)) + D4:MSG("[D4:SV] db is nil", "db", tostring(db), "key", tostring(key), "value", tostring(value)) return false end if key == nil then - D4:msg("[D4:SV] key is nil", "db", tostring(db), "key", tostring(key), "value", tostring(value)) + D4:MSG("[D4:SV] key is nil", "db", tostring(db), "key", tostring(key), "value", tostring(value)) return false end diff --git a/libs/D4Lib/D4Frames.lua b/libs/D4Lib/D4Frames.lua index c4f1bad..36d6d1c 100644 --- a/libs/D4Lib/D4Frames.lua +++ b/libs/D4Lib/D4Frames.lua @@ -1,8 +1,4 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... --[[ INPUTS ]] function D4:AddCategory(tab) tab.sw = tab.sw or 25 @@ -106,7 +102,7 @@ function D4:CreateSlider(tab) if struct then slider.Text:SetText(string.format(struct, tab.value)) else - print("[D4] missing format string:", tab.key) + D4:MSG("[D4] missing format string:", tab.key) end slider:SetMinMaxValues(tab.vmin, tab.vmax) @@ -129,7 +125,7 @@ function D4:CreateSlider(tab) if struct2 then slider.Text:SetText(string.format(struct2, val)) else - print("[D4] Missing format string:", tab.key) + D4:MSG("[D4] Missing format string:", tab.key) end end ) diff --git a/libs/D4Lib/D4Grid.lua b/libs/D4Lib/D4Grid.lua index fdcc8fa..7e9504c 100644 --- a/libs/D4Lib/D4Grid.lua +++ b/libs/D4Lib/D4Grid.lua @@ -1,8 +1,4 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... function D4:Grid(n, snap) n = n or 0 snap = snap or 10 diff --git a/libs/D4Lib/D4Lib.lua b/libs/D4Lib/D4Lib.lua index b0bb0d2..ff08d36 100644 --- a/libs/D4Lib/D4Lib.lua +++ b/libs/D4Lib/D4Lib.lua @@ -1,8 +1,4 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... --[[ Basics ]] local buildNr = select(4, GetBuildInfo()) local buildName = "CLASSIC" @@ -26,7 +22,7 @@ end D4.oldWow = D4.oldWow or false if C_Timer == nil then - print("[D4] ADD C_Timer") + D4:MSG("[D4] ADD C_Timer") C_Timer = {} local f = CreateFrame("Frame") f.tab = {} @@ -51,7 +47,7 @@ if C_Timer == nil then end if GetClassColor == nil then - print("[D4] ADD GetClassColor") + D4:MSG("[D4] ADD GetClassColor") GetClassColor = function(classFilename) local color = RAID_CLASS_COLORS[classFilename] if color then return color.r, color.g, color.b, color.colorStr end @@ -85,7 +81,7 @@ local ICON_TAG_LIST_EN = { function D4:GetCVar(name) if C_CVar and C_CVar.GetCVar then return C_CVar.GetCVar(name) end if GetCVar then return GetCVar(name) end - print("[D4][GetCVar] FAILED") + D4:MSG("[D4][GetCVar] FAILED") return nil end @@ -94,7 +90,7 @@ function D4:GetItemInfo(itemID) if itemID == nil then return nil end if C_Item and C_Item.GetItemInfo then return C_Item.GetItemInfo(itemID) end if GetItemInfo then return GetItemInfo(itemID) end - print("[D4][GetItemInfo] FAILED") + D4:MSG("[D4][GetItemInfo] FAILED") return nil end @@ -103,7 +99,7 @@ function D4:GetSpellInfo(spellID) if spellID == nil then return nil end if C_Spell and C_Spell.GetSpellInfo then return C_Spell.GetSpellInfo(spellID) end if GetSpellInfo then return GetSpellInfo(spellID) end - print("[D4][GetSpellInfo] FAILED") + D4:MSG("[D4][GetSpellInfo] FAILED") return nil end @@ -111,7 +107,7 @@ end function D4:GetMouseFocus() if GetMouseFoci then return GetMouseFoci() end if GetMouseFocus then return GetMouseFocus() end - print("[D4][GetMouseFocus] FAILED") + D4:MSG("[D4][GetMouseFocus] FAILED") return nil end @@ -119,7 +115,7 @@ end function D4:LoadAddOn(name) if C_AddOns and C_AddOns.LoadAddOn then return C_AddOns.LoadAddOn(name) end if LoadAddOn then return LoadAddOn(name) end - print("[D4][LoadAddOn] FAILED") + D4:MSG("[D4][LoadAddOn] FAILED") return nil end @@ -127,7 +123,7 @@ end function D4:IsAddOnLoaded(name) if C_AddOns and C_AddOns.IsAddOnLoaded then return C_AddOns.IsAddOnLoaded(name) end if IsAddOnLoaded then return IsAddOnLoaded(name) end - print("[D4][IsAddOnLoaded] FAILED") + D4:MSG("[D4][IsAddOnLoaded] FAILED") return nil end diff --git a/libs/D4Lib/D4Math.lua b/libs/D4Lib/D4Math.lua index c1d72e4..f5c3641 100644 --- a/libs/D4Lib/D4Math.lua +++ b/libs/D4Lib/D4Math.lua @@ -1,8 +1,4 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... function D4:MClamp(val, vmin, vmax) if val < vmin then return vmin diff --git a/libs/D4Lib/D4MinimapButtons.lua b/libs/D4Lib/D4MinimapButtons.lua index cf25d81..ba1b3d7 100644 --- a/libs/D4Lib/D4MinimapButtons.lua +++ b/libs/D4Lib/D4MinimapButtons.lua @@ -1,8 +1,4 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... local icon = null function D4:GetLibDBIcon() if not D4:IsOldWow() then diff --git a/libs/D4Lib/D4Output.lua b/libs/D4Lib/D4Output.lua index 5fc3f7e..4870c4b 100644 --- a/libs/D4Lib/D4Output.lua +++ b/libs/D4Lib/D4Output.lua @@ -1,12 +1,11 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end -function D4:msg(...) - print("[D4] ", ...) +local _, D4 = ... +local nam = "" +local ico = "" +function D4:SetAddonOutput(name, icon) + nam = name + ico = icon end -function D4:MSG(name, icon, ...) - print(string.format("[|cFFA0A0FF%s|r |T%s:0:0:0:0|t]", name, icon), ...) +function D4:MSG(...) + print(string.format("|cFFFFFF00[|r|cFFA0A0FF%s|r |T%s:0:0:0:0|t|cFFFFFF00]|r", nam, ico), ...) end diff --git a/libs/D4Lib/D4SlashCmds.lua b/libs/D4Lib/D4SlashCmds.lua index bcac743..ad9eac0 100644 --- a/libs/D4Lib/D4SlashCmds.lua +++ b/libs/D4Lib/D4SlashCmds.lua @@ -1,12 +1,8 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... local cmds = {} function D4:AddSlash(name, func) if name == nil then - D4:msg("failed to add slash command, missing name") + D4:MSG("failed to add slash command, missing name") return false end @@ -26,7 +22,7 @@ function D4:InitSlash() end ) else - D4:msg("FAILED TO ADD SLASH COMMAND #1") + D4:MSG("FAILED TO ADD SLASH COMMAND #1") end if ChatEdit_SendText and type(ChatEdit_SendText) == "function" then @@ -43,7 +39,7 @@ function D4:InitSlash() end ) else - D4:msg("FAILED TO ADD SLASH COMMAND #2") + D4:MSG("FAILED TO ADD SLASH COMMAND #2") end end diff --git a/libs/D4Lib/D4Translations.lua b/libs/D4Lib/D4Translations.lua index 29b49a1..9ff606a 100644 --- a/libs/D4Lib/D4Translations.lua +++ b/libs/D4Lib/D4Translations.lua @@ -1,8 +1,4 @@ -local _, _ = ... -D4 = D4 or {} -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end +local _, D4 = ... function D4:Trans(key, lang, t1, t2, t3) D4.trans = D4.trans or {} if lang == nil then @@ -37,19 +33,19 @@ end function D4:AddTrans(lang, key, value) D4.trans = D4.trans or {} if lang == nil then - D4:msg("[D4:AddTrans] lang is nil") + D4:MSG("[D4:AddTrans] lang is nil") return false end if key == nil then - D4:msg("[D4:AddTrans] key is nil") + D4:MSG("[D4:AddTrans] key is nil") return false end if value == nil then - D4:msg("[D4:AddTrans] value is nil") + D4:MSG("[D4:AddTrans] value is nil") return false end diff --git a/libs/D4Lib/D4Versions.lua b/libs/D4Lib/D4Versions.lua index 7527215..5746728 100644 --- a/libs/D4Lib/D4Versions.lua +++ b/libs/D4Lib/D4Versions.lua @@ -1,6 +1,5 @@ -local AddonName, _ = ... -D4 = D4 or {} -local pre = "D4PREFIX" +local AddonName, D4 = ... +local pre = AddonName .. "D4PREFIX" local f = CreateFrame("FRAME") f:RegisterEvent("PLAYER_ENTERING_WORLD") f:SetScript( @@ -44,9 +43,6 @@ r:SetScript( end ) -D4.LibVersion = D4.LibVersion or 0 -local D4LibVersion = 1.0 -if D4.LibVersion >= D4LibVersion then return end D4.VersionTab = D4.VersionTab or {} if C_ChatInfo then C_ChatInfo.RegisterAddonMessagePrefix(pre) @@ -54,25 +50,25 @@ end function D4:SetVersion(name, icon, ver) if name == nil then - D4:msg("|cffff0000MISSING NAME AT SetVersion", ver) + D4:MSG("|cffff0000MISSING NAME AT SetVersion", ver) return false end if icon == nil then - D4:msg("|cffff0000MISSING ICON AT SetVersion", icon) + D4:MSG("|cffff0000MISSING ICON AT SetVersion", icon) return false end if ver == nil then - D4:msg("|cffff0000MISSING VERSION AT SetVersion", ver) + D4:MSG("|cffff0000MISSING VERSION AT SetVersion", ver) return false end if D4.VersionTab[string.lower(name)] ~= nil then - D4:msg("|cffff0000VERSION ALREADY SET", name) + D4:MSG("|cffff0000VERSION ALREADY SET", name) return false end @@ -98,7 +94,7 @@ end function D4:GetVersion(name) if name == nil then - D4:msg("|cffff0000MISSING NAME AT GetVersion") + D4:MSG("|cffff0000MISSING NAME AT GetVersion") return false end @@ -110,7 +106,7 @@ end function D4:FoundHigher(name) if name == nil then - D4:msg("|cffff0000MISSING NAME AT FoundHigher") + D4:MSG("|cffff0000MISSING NAME AT FoundHigher") return false end @@ -136,7 +132,7 @@ end function D4:CheckVersion(name, ver) if name == nil then - D4:msg("|cffff0000MISSING NAME AT CheckVersion") + D4:MSG("|cffff0000MISSING NAME AT CheckVersion") return false end @@ -149,5 +145,3 @@ function D4:CheckVersion(name, ver) D4:MSG(name, D4.VersionTab[string.lower(name)].icon, string.format("New Version available (v%s -> v%s)", D4:GetVersion(name), ver)) end end - -D4.LibVersion = D4LibVersion diff --git a/libs/math.lua b/libs/math.lua index 28669e5..103e878 100644 --- a/libs/math.lua +++ b/libs/math.lua @@ -1,4 +1,5 @@ local _, ImproveAny = ... +ImproveAny:SetAddonOutput("ImproveAny", 136033) function ImproveAny:Debug(msg, typ) if typ == "think" then return end if typ == "retry" then return end diff --git a/settings.lua b/settings.lua index 42fd1e1..1dcae9e 100644 --- a/settings.lua +++ b/settings.lua @@ -377,7 +377,7 @@ function ImproveAny:ToggleSettings() end function ImproveAny:InitIASettings() - if not D4:IsOldWow() then + if not ImproveAny:IsOldWow() then IASettings = CreateFrame("Frame", "IASettings", UIParent, "BasicFrameTemplate") else IASettings = CreateFrame("Frame", "IASettings", UIParent) @@ -420,8 +420,8 @@ function ImproveAny:InitIASettings() IASettings:Hide() end - D4:SetVersion(AddonName, 136033, "0.9.72") - IASettings.TitleText:SetText(format("ImproveAny |T136033:16:16:0:0|t v|cff3FC7EB%s", "0.9.72")) + ImproveAny:SetVersion(AddonName, 136033, "0.9.73") + IASettings.TitleText:SetText(format("ImproveAny |T136033:16:16:0:0|t v|cff3FC7EB%s", "0.9.73")) IASettings.CloseButton:SetScript( "OnClick", function() @@ -511,10 +511,11 @@ function ImproveAny:InitIASettings() AddCheckBox(24, "ITEMLEVELBORDER", false, ImproveAny.UpdateILVLIcons) AddCategory("FRAMES") AddCheckBox(4, "WIDEFRAMES", false) + AddCheckBox(4, "IMPROVETRADESKILLFRAME", false) AddSlider(4, "TOP_OFFSET", 116, ImproveAny.UpdateUIParentAttribute, 0.0, 1000.0, 5) AddSlider(4, "LEFT_OFFSET", 16, ImproveAny.UpdateUIParentAttribute, 16.0, 1000.0, 5) AddSlider(4, "PANEl_SPACING_X", 32, ImproveAny.UpdateUIParentAttribute, 10.0, 300.0, 1) - if D4:GetWoWBuild() ~= "RETAIL" then + if ImproveAny:GetWoWBuild() ~= "RETAIL" then AddCategory("XPBAR") AddCheckBox(4, "XPBAR", false) AddCheckBox(24, "XPNUMBERLEVEL", false) @@ -538,7 +539,7 @@ function ImproveAny:InitIASettings() AddCheckBox(24, "REPHIDEARTWORK", false) end - if D4:GetWoWBuild() ~= "RETAIL" then + if ImproveAny:GetWoWBuild() ~= "RETAIL" then AddCategory("UNITFRAMES") AddCheckBox(4, "RAIDFRAMEMOREBUFFS", false) AddSlider(24, "BUFFSCALE", 0.8, ImproveAny.UpdateRaidFrameSize, 0.4, 1.6, 0.1)