From 5972ef8c05f1fa95ffeaaadf6d90c32939731363 Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Tue, 15 Jun 2021 09:06:50 +0200 Subject: [PATCH] cleanup --- EventListener.lua | 34 +++++++--------------------------- Images/Square_FullWhite.tga | Bin 0 -> 530 bytes ImportStrings.lua | 2 +- Modules/Diminishings.lua | 7 +++++++ Modules/Healthbar.lua | 4 ++++ Modules/Pets.lua | 8 +++++++- Modules/Racial.lua | 10 ++++++++-- Modules/Trinket.lua | 8 ++++++-- Modules/XiconProfiles.lua | 2 +- 9 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 Images/Square_FullWhite.tga diff --git a/EventListener.lua b/EventListener.lua index 4a70816..5b45ad8 100644 --- a/EventListener.lua +++ b/EventListener.lua @@ -1,7 +1,6 @@ local select, string_gsub, tostring = select, string.gsub, tostring local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo -local RAID_CLASS_COLORS = RAID_CLASS_COLORS local AURA_TYPE_DEBUFF = AURA_TYPE_DEBUFF local AURA_TYPE_BUFF = AURA_TYPE_BUFF @@ -34,7 +33,6 @@ function EventListener:JOINED_ARENA() self:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START") self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED") self:SetScript("OnEvent", EventListener.OnEvent) - Gladdy:SendCommMessage("GladdyVCheck", tostring(Gladdy.version_num), "RAID", UnitName("player")) end function EventListener:Reset() @@ -80,17 +78,6 @@ function EventListener:COMBAT_LOG_EVENT_UNFILTERED() local srcUnit = Gladdy.guids[sourceGUID] local destUnit = Gladdy.guids[destGUID] - if Gladdy.specSpells[spellName] and srcUnit then - --Gladdy:Print(eventType, spellName, Gladdy.specSpells[spellName], srcUnit) - end - if (eventType == "UNIT_DIED" or eventType == "PARTY_KILL" or eventType == "SPELL_INSTAKILL") then - if destUnit then - --Gladdy:Print(eventType, "destUnit", destUnit) - elseif srcUnit then - --Gladdy:Print(eventType, "srcUnit", srcUnit) - end - end - if destUnit then -- diminish tracker if (Gladdy.db.drEnabled and (eventType == "SPELL_AURA_REMOVED" or eventType == "SPELL_AURA_REFRESH")) then @@ -143,12 +130,11 @@ function EventListener:ARENA_OPPONENT_UPDATE(unit, updateReason) if button or pet then if updateReason == "seen" then -- ENEMY_SPOTTED - if button and not button.class then - Gladdy:SpotEnemy(unit, true) - end - if button and button.stealthed then - local class = Gladdy.buttons[unit].class - button.healthBar.hp:SetStatusBarColor(RAID_CLASS_COLORS[class].r, RAID_CLASS_COLORS[class].g, RAID_CLASS_COLORS[class].b, 1) + if button then + Gladdy:SendMessage("ENEMY_STEALTH", unit, false) + if not button.class then + Gladdy:SpotEnemy(unit, true) + end end if pet then Gladdy:SendMessage("PET_SPOTTED", unit) @@ -156,9 +142,7 @@ function EventListener:ARENA_OPPONENT_UPDATE(unit, updateReason) elseif updateReason == "unseen" then -- STEALTH if button then - Gladdy:SendMessage("ENEMY_STEALTH", unit) - button.healthBar.hp:SetStatusBarColor(0.66, 0.66, 0.66, 1) - button.stealthed = true + Gladdy:SendMessage("ENEMY_STEALTH", unit, true) end if pet then Gladdy:SendMessage("PET_STEALTH", unit) @@ -213,7 +197,7 @@ function EventListener:UNIT_AURA(unit) end if not button.spec and Gladdy.specBuffs[spellName] then local unitPet = string_gsub(unit, "%d$", "pet%1") - if UnitIsUnit(unit, unitCaster) or UnitIsUnit(unitPet, unitCaster) then + if unitCaster and (UnitIsUnit(unit, unitCaster) or UnitIsUnit(unitPet, unitCaster)) then Gladdy:DetectSpec(unit, Gladdy.specBuffs[spellName]) end end @@ -252,7 +236,3 @@ function EventListener:UNIT_SPELLCAST_SUCCEEDED(unit) end end end - -function EventListener:GetOptions() - return nil -end diff --git a/Images/Square_FullWhite.tga b/Images/Square_FullWhite.tga new file mode 100644 index 0000000000000000000000000000000000000000..15e2be4e492bef107afbd0151c0fc5034b781c23 GIT binary patch literal 530 YcmZQz;9`J*28IR(35NfpU_^%i0BG_5G5`Po literal 0 HcmV?d00001 diff --git a/ImportStrings.lua b/ImportStrings.lua index 62bdfaa..f1d8755 100644 --- a/ImportStrings.lua +++ b/ImportStrings.lua @@ -13,5 +13,5 @@ function Gladdy:GetKnallProfile() end function Gladdy:GetBlizzardProfile() - return "4XzVB12KBBJd(xuZW3F5JXj1TzM2K9Q3oT3mDCRST2D1vVw7jjFPB)q)TFGeGsYYsBSACZhsSSmjaiii5Zda31813UE1UQfLv7YREt5(YQWlYw)E(6vvRxAywTsPemj3BDk967(kTA9Q7N8x2m1V0SE12YY97k)4HVikBZX7UREr4)E9(NEa1X2S6MfztoyTkNtkDGS8kUwYcYsg1)e)YMP(LMGp9n0WTt)vzBlY2p17rZAvZZ7ZxV6DhAYRUlBB(V86D7(WH6F5B2NTB3Z)Y7Em7(86FbB7VwvE8WU8D)6M9pf04BlQZ2Sp)nfvBbzSPBaFFVb7sTKRekR2l0mVs1nyEplmyd)Fv4)HbrtvXHFpV5m5Ig8xFi82DRxSE1d5z7BEau17ZEmFz5HMvf)zom2Gb3HNUTSj)XB2N1KJZfVE)hZEU(2SQ7ZBGUVHMSw9q5hF9XQS3Mh)ANEUPSE9QfF42B)W3VE1tLFeCsqt)bW5eAtRQVn)pAowb(Uf7l(Z)mRA3F9B)qwb8)WVf8orZAB2(8OppfZ)33F)qX9pSh(xt7iinZEIb3AFFB8HEohr)O0uF)MQYp(2IQ8TnfLhwV6hE338T326eJtJ1H5XMWxLwPl8LTddL7Mj3qZKzyWg7vM1RYBN3AibX1CM9Qijh3(Yc6vPyTx5fFAXj0E21zi64E21rqoP(QiiJYFDeKq5utiOxPtEDYPR)0ItdBLDvSlNqCDcQKmlZCvKKJRKJlio5O8KJI)PfgNPVsZGAJ96iiP0yMyaotj54MRKlNz5xfbj1E)vrqWEuxPTc4URZqZPHddMyfS30xwVc2N(tkoTvEDgGsH3nLHnpjXntV)lmMCdx9z(0IecSUolAGPXRZgEaaWpxlc(P7pfbqchbabOk)XYimM1REBzvr9n3ackGyAi(SNYB(3FaavK3S(9FLYIT67kQBEB(Dzh33eSnJfxf0P9vpvvaIT551VhqfcG)Y2(7GM(6f)4YLbdt4O4Qr7cxpsx4cPwppTWzs8i)z0fNsmTwg1WKW2B85QfJEMgMKleQj7IORlDDGZTZBKi80o1J3LZ1HWYCtpoKJo09AMCEdDUw5M5iHlCm)80IqlSt7Gh3WmE70Az0HVuXNowzmpSX7MPkemTAMJDiQ3p9844EyRD6qLXvICUl5DE30Hktm29ZCoutiEV8Ea8CvthooEqVq4fxYyVBNl10w1iHjoJAMlQem2lSwF8jqHtmZU4Gr(86HuzEbx1i7Zje65E6JXREHirXiBZjeZ09Q0k50ROgB7ALYpZLhCNCMwfSo3m9wdJReMW(cBnC(aH7LUzgLiLs)0h6o6kkTq9cNun6abIRMzSOq6ftpNOpFSRTUzQcdBMyAKs78DVc28owhWanZWeJAwlAnY5I)XZMTNIjEHJpMy7QxiwFKHbxjNlmda)JD6tpgRlnPC71LR5394JhpKhKcslatcMNy(WeuAiGEUT4Zn3KabGV9YYl6uPNTl9RTmjybl7Nk218WYSTnLyst(F5v1apLF9XS)tz1VE44JX3Ij987Z(JUm0EtE128dnGjhE3UQFUNyBtL67oeE1IEzn9epX7lbh4zo2LLvpEQBTFESFLRVl9F4QoSDFwD972w(LPghPcQ0odXjQEFUHpuDdcunhme2SMYugVx4AxR7YSnebgdvGVjnb)FhHujVnSRomxFx52J1t6WCAbqR2ZKgMXzfTfLHythTGDvbF(nWWQ4aABdJrcfw4tfJ0Rp)9DDX6teZ2FS0aXsGGMh6BGt)xLvb7J8gOxnHzp89cTjTGJAOQZlfQ3XxFi)XNJB8qAON)gggzhoacCB(JWAmScbyTB(H8SDphwXv)u(2q3ZJYztBd(XAC)mCfxCTzEn4nEkRc2CBvvE9XkkzeXzRDHUv31JBFaAYdqGyCZ2gY(OL(rx6p3LkI0qCqsm2wqobyGCxv2J5D1PPR9DVlk124jP(8P76E1MkApNU7tAHZphRudvJfutd3FB4grr7mMp9EHTb1STONoPLe9I5Td2Qffu4OJ9Wmu(ifLK1lonLfP4ozV(W2hGw1zAHjLEkVROsdhmXtPY3LQWgOhhdqeTiGy06THhaspamIWBCaYRWlKaY7Wd2aer4ZqgDweGnzI9u4bwmH2N(eWHWdpalzJnKlfCxuar5fzxe6hhGchFThFHMlJnJ(DesAqFjfgqpg(olPippAycMfTeghFqQqbfGAh(ulqjzSohkbPcBqiVrls0rcVHhBi3O5XXGWzrrbgh(74xJ5djijbzKgjAusfl69CEruarg3XbHvfvLlPBTW4PXjZq6ghgkJcngT2IwH27JTvXjdgbucpODXFW4izfkKa8GLr(qy6m(GeC74qwyITicnlQnUeTubQurYDhQM9IOxfvfs(m0vh6LJ5Qk2fhoO1c8tm3plImCT0ly4dEfhLQd9KbPJ(dWUWh8ECmaW6SyNKuSPbD6cJ0sJfb(cVn2vDA6dcMXgAWhSyhrMuWdkwu5WVIAYqHGCyG0gmhfPjC6vSjoDuP6uKIqIk3PXEaHq4uHfNlOzm8xbVDS3WHyyVTCATrYjlWgAzOtGJV3APpWLmakumGG5jNM1tH6k6bUj2cjJJJrKwaksdfNXXGzHssIbxNamMXGyAbpS3a1bbTSkW2DbreiQEbja0(IPLzbXOk8ApT6H6h0AAbl3fh(gmg0YjNI0e)DjNcRHfjOMaUMX2JlMaVhfQqYHluToK46UM2J36omnDU5lVtlRBNwact3rxCPoSPF)SW3hyCa115xSJw4G9pNjD4ZiNP9fb1yFqflRkYpSB)ZurdA5mmpKFjGEkhw9IF8PO86Ht5cK1UQH(ZeaNoNeEI3R32CmBF)ZXdt9B6SJaIGDv)RJacMZ8MDt0VY2BG0BojUtNOZ(Fz(t1nznhR3KcRsdbBp)zpShliX2ne6hq1HMJCSJf2aiRcru1Gu)UIdHyBk4PhcGUlFuFjeBv)r4(YaAGqhi9Lc3xAdCKLWjWAy)KWrBqWtki98W8HXUV5yvD(iZ2j02MHU8PMJ6hQLGlhNRhOWVp7(ITJPWq51IQeVRjuqvA8NmHZQF2UQ3FC)(jJC6SQwx6fmc6pt3N87ZRx6aKlHDLTm4yqMlCLSGDkx9hRFVt7ELfGKXa2pmMKQ3xe)2uBwObWlbWzSWXIwv8(DzWnlcvWZ6a4pXzxxVRXMh2lNb4ouCJYah5b)IESKyCZdpxxaRh)uCPAcCiwC6Mk9rqdg0MYMMYh)(SQ7loaBWk0T7z3nhblYcml6bPnTjXsLfofcSwhCAreyh4ZmJPWxEAS)9C70DKp96k(3NryKq(lmFz4aEfJbWBjGHJ0nGH7OZNXlbWdZC36ORHyLgI(l6hf2MlH4ogF3xV82U1lxqW9UQtwyHBNCBXJ5XSZK1Kez)PNKXy6P(Eh4oy7MbxmouCTjoQFSLmQMBkRa6ofnFUtFTWgU)eidHtpIzWJMQcFwHF2DW4j6U74J3c8mlV)uMFdpb(07SPvWIHakG(aeR7ApM)8yzmQiCpmP1FNCUW3MT)Uly6SVL8YnN1B4gZYXFFhD3CwYK3SEKBi5j3UssZHSv87xYsGEPiQjEbu7iW3PP2GWZqnEsEipp1P0jo02jNFqzFvE(gboa)TrWuALg4JO1DBeehnlnAjS3SYcFi9A8q5y0gM5IrofBImIqPbyrkjaWXbiWAHJ4dZei)dTwq4Rj6UCczpdjmbMtSJwIiG3KOnLskGL4YAikQcbXevg2Sd)jhc7pWhPLndI33Ri(piVcSda9bKdRa44qYc4Bh7PYHe4aEdOfPOM6Dy2f0sIVjSvkQEjjIWv1i8DnCYcogXEeevIRkzOcNch(EKpI3H(pTiXiwG2dG(gjZcmrPblhzHjGtTit2I5lXMOORse24i59WuoowI1Nm(a4frPaUQKrIK0axsRxIMujoT2ejufMCJGMJA0NOvfBUHMZzkIBhMEclMTgsMghrbhtFKWAqdc0f2aGYhkoMNsLcyHyIfCuouSkIEPsKsSJtKAkoQyPuhzWXnsFxciHOCjrembY4XhCi)yosxeckjRKJzmiLxcnLwerIPQ2qz)cKiAuWkn0k9usiaZfduePSoWeTEmuRAb2wP0Aig1gxAAhh1wzkZmkmlkPuxq5yr6igTkbn084eSuquJbSIORatjcLdgHYHmLt2aLabPIMq4mgjpMGOu784eJhTrbeQIbEcfLVbghd8WIrg7TdhhG1HjrWqUsd6DOGfqByYSmu(mmu2jejX4jA6dbyc7ILNnG9qIWMQp)HUTR7sUEi)XTCUXxzzdpnEijRZo2yPwd7V5mgaXfePbtqr0Wre0q8Ha4xQbSNoHl93oXa(WbT)pmjEstFZX8668y247Fs4WKbF2rdNbRVSOgqvnMt30Dm)UjqAEg8buPpFi7XITyZx0JRebXU)rL9PPEcS21eIYnNprVzSmC3H(52YxhkZY721prbJKIMIOUV9d3CY03OgucWka)(eipOjj6f7DIzfVwRjiXdtMqRl4KZNJV5QGCnKLNvuPFgIwgL8Q)7XSQ8)63wcuE)RF7NEOOjVFzpga7DcuNXjJoV6dttbJnUaqmmJXiz4uCvV)AP(YSklnVhI6gMLS4K)YqPi4GqG9lHn6rc8(WcMHg)UQ3aOfVVSQipc9QEFE(tHh6DZcURSABEikke5we(mudvMhHA3uTVU54HlPpAaow03Ey3f3fNbvZdzyr1)uDWeoza6WVxFjTgoSiMEG6Tznq88L1ho9xuhSfviDLnxsNmH)QdcDA7f1AaZvO13LNvDjTpu7QOJTS8ISgTt5OjIz0LyoRQYFkK7WdBZVOE5XETRk7(Yd1BQYZAE4s6OICYhZUKwRdLOj4VQYZ)ZCGoXffcRDY4QQIhFcEZfnX0go(829LhUixGHhTTMbBJ(p9of0MvdVhc9tc(6bPDmDyuCvaEDfJqNOQDbQalGkEx1x0dBFBf3AR0wOGryJjW9PsLCgVlUiv)04LAk8qBH2ii)aPogvIphXwssnr6KerM2YZYjYqP6ZcKY8eNpo9GhlULuPOkYcVbbeAtLSZzr8PoMQ1mP6eJG5BjOHx49Or5zNwowa8oAtcnvc4eo0eg92kNbGDPcFNaAN4S1c)fqiJLgfMaiVSssuNs04ARjgqEHkkLIkkfWrIQIvc8F4mcIFyQgNY0eP1liiYjwFjm3Ue(8u9xBPbsyU5EHjXyLCIe1APrJa4fgdvT5yP8AgnXS9ZTrV70tkS9K0DC(nliUwB4R7aJdqqsRuhKsLUBuXPq6p768m8LP1r4rWgfW1cyjfkMBKohCeSlHwiDLjiZC9WlQ1NbiRb4b6DRwoXH95QNTfTORAwV()FZX8M7" + return "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lW)2Y)vAm9tmolPpP)7ltPNALZy)z4qaqCgC4qVgY1Xhuk2Se7r0bxEus9zfwlA)139ce9ug4HNf3RHyDAEFmHZsShbzgAJ(iX02hwN0h41Se(05n(Pyk4UFglCsrYG6nEnKlEFvVa5Ee30Xj2Vw666i)ZylTB4Xx(AiwU(vobAvRRd6Y0hYAHyJVSgPE7BdaVpI2m6Pp0Dp5pMEyrO7T6Z)EWSX7GkstfUCOYCAEzwAz2y6ZrksJc8Jiimp3vUb0Hw3esu4(AUqt11zfR8x5)9zHkMiLOLLJngw3FYCwAkAvjAOvvtrf0fMaA52TbG1V7JHMa)6H8DWC1Yq(t87hFZnxCvRxWe6a)fU(43F8PxCz9lW73aEXho(TN18uukxFZfNT426NkfsBcj93F1B(VQFr4mlGNF6nF8ItBAE4ygGhFZvV9JnYgVhv4XlE3XF442AI)sFdE2fHlCQX597F(eWFUzj7hFLtFPa2p0qoHgH18SGZwD5T(75SV7xzR7ie8jUEFbutDEv8Pn01IUGpvCG6FxxBgJ)uIEx42lDdvKKD33Yz9CTKRekRorO90DJroJJeoPPi52hoqhne1B)zl04nEDRLdVDI0IGBS)yasbj)(Zo)wFSNwMZMlmTVTkCSfzRJeq7wpdgImlGiYHqKOXlFhGnhEG0GSqWg5qHoWgaTLiRqsKHg0FvcK9cjmjrBabpCr)irfch3SVFWEGqhSj4d0CzKBdO8IJxCajkBiJucrLGKyqa16H)LJ)qs8PWre4qlqjzSi1gKmjY(HWfjEs88P9pHi4HrJuNq4i(wakh((UC4a2XsIwsKyqHuKWLiqUxyT0KWQcdLlo2AbrYHejsDcySXPHYOqLrRTOwaaPcTvXjfg36d)qJS2G4ndpXGu1WYIKTa5NbyAjc14eMqlcNvxy04iVrqYwqxHRxYAz0QIdvnLosCeFB8xEzOleVq0IEe9Xzuw6bm8hjkokvhAj9shThGEH)ijs3KAM(ijFtdA0fgPLMlidJej2qx1XLpWzgBOb)HLyCt4O1HFOqMNaVfhjd5cYHjsTZCqKgUK8iC6WGQJEkcjo4onXYjnowGtw4V0kg(wWAJmsI4Qe3YP9grJSaBOLHgbo(CRL(dULrBTDjgeKXJC1v0p4r2xXX5iEoXOijMib)p0SPKr(fH)BRaDIPn8qSbQdcABfrFOWjdhgEbjau)c3t3j0rS7FCcT7H6h0AAdlX6id6dA5KrrAqkDXj3AytcossjzBrfYsSxkHKdxOQniH9Dv1blJCTbcjuNE7xcUdA8F7tzLLzLELRFkWpKEF(Qo4VILvAi8xHK((t3CiPPtRjs8uZgBcS(WGyjkUrza3yqZ04SXtTdRdcdkb)DWXPE2OHaF(a7m)wklMsRbeyl8D3nC601u(AEOPuIYabQp3tK21BF2RbXN7nUeAHHyA8eS6Jp2LHJVjMoUEE0LArdtb7hI(in(XNrBSeHWkFJFOhluJGAJNaXDpk6HwvBmKevyZ51NerlT)MaIPwy27O5nG7ofA1(7xUyBwk8ASrT61a4GD5Nwd4EQ9DVbeu3)q6F7TXLGp07Z35r0rw(waxA(8cAlHqRAxO129Eqm(o0600NICzTSlRYBrrUrkp7npv0REiEN6ZmDnUxbZ(i0QWT3KpaUvlc87vx)E22tKOTz4hUqRIKoWjxTv6aCqAV41(kPiZ5Ihtl(6bmK)neJXa1DR8FJbaaiTXhVasHalKx(02TtPjSEADRLGR38CzoufX)PQKbaZiI4826)D7RGQ8)ay19178BcB3P0OqKJUeNRSqwnisPdY(eakctftnK5tIaMHqMysiHJWoYeyUAToYixcAiNYcYqWfGfk0rlL0mXeHyebqBjCFdObTKtCKfGHGPi95URZ8J5gtuewbmhSI4HlhX7ja8aKSCe1HvoeSdKJf1if10ehIexljSzqQaC4LKii2nd46SrY86IIkIRJuubX4AtcM7oXH2pTiIEKOYme3hb(bO2OjlXBzbSIqQSfRTWgHZQIGBIergAboxI8owbO)rqtEtvujjAqtuu3RT0IkH)ZgbSrmu3pYHrmjcbj0CdTMtCrNBrO8wSYgsMr(y7WsTewdQqWyHnaGhHIJLqLDaAiccN4In4AqqXuIyrqorSP4SIflZYGZBeQRKXKuDxrQJlrYB7qSKeJ1bNssl5i66igEnvcHiIQtBOkfbjIkLIy0nGC3gvx0rrerOZe1wmCubqtObwAne6tJlUSJZARmwfJcR4icZNQhr6i0FQiR4tWfyPGGr6yC0uGLpq1RiuoevzuhiW2sfTGWzrQ6Zee8txcUWeP3o4QsuuN4Fp4cHoE1uHh80X5bODiGBdzkjQWtol10(3qy)nesErumjeK2y(dFc3MZAPltV)3FghHBr)hGNCmSHTo9)ZbZleA0a1nk8HRC1iH3mZuz1hwsN8PHZPMq5ngaJ)i8q84qOO(Ta1jIFunlJ5EZBG7fV7))92U2aN6aPBqcywDAVj(mcWzq9NMt7t1s6v12NBwSEMEWiT4OEKKkNGUE8JcRg1yl6EATRl(VFkTOAmw6hpvyBZsuNtXTZHIzfSGtcSLfkXaYJHW7hdwl6x4pCDVc06dfa1N3LU9lhayguknFLNTx7)xVE2fUCF8TJF0LVuFOhBDZbnMMB3FS)7A4I19Xf(JnnS6I2o06vg(bkGyEJ75gwckOnTSe4PZoakBnUukGvyB8WVLMoF8PDcySS(6vM40JRdxGRtww3cgpBx2dphAhU4nsGnnarZbfYlsGKLqoMMcLHuCcOKnaKRZjCS6cLPavnUA)KRaog5)a2paRkT4pMuFeN8BORcsmcQ795L73n6EEtJ306jIFpqdcI)0N3L(q(kS5N0P(8wPUqdyuFp3QchiH0Pbqas8BAMp8kC(d)ry4zLKdqLPTqpcFTqGI88YZDEOrkguqcKgYJfcWXRIkvFVZ1fT)QB6)To26JSpp4GE7vx3zvVDEOn9)2W9jhh5JQmEy(TlcRTs0j3qJgq2Vw(9Di53liSt869aVKvE52p1dk5f)Vq6HSV)5ZHc7((N)9n5vWdt3Tde1QShG8iip0qD6giDy4eAkjzMf2e2CPoFSeNdOrlSs4ROZxMw1ZGzlR8PckJyjMna6wztpUDd0Kn(Z3XNap6Z1yT28l9kgXqFFAepP(NiqrR)V6GFYHm2CyF)y9pQHqq0Z9xTchemGPfaJhc8bqRhSrmUt(iBp)2oHZB2e0oQn1Y(3zE7BnEzVZjPBWd0w2C9GnjvQxj6)D3n8(WcEJ9FCtgfW9nEmH9sMgVMX267bGTT(WgBpNJZp02BuqHqqjm(BLiuRfy7DXP7X7wTbgJOMVSp9BFbXb65iSSZPOUkpoY1(vHhg3XvTC5))Oi6pdb" end \ No newline at end of file diff --git a/Modules/Diminishings.lua b/Modules/Diminishings.lua index 7033786..dfd8ed9 100644 --- a/Modules/Diminishings.lua +++ b/Modules/Diminishings.lua @@ -387,6 +387,7 @@ function Diminishings:GetOptions() min = 5, max = 50, step = 1, + width = "full", }), drWidthFactor = Gladdy:option({ type = "range", @@ -396,6 +397,7 @@ function Diminishings:GetOptions() min = 0.5, max = 2, step = 0.05, + width = "full", }), drIconPadding = Gladdy:option({ type = "range", @@ -405,6 +407,7 @@ function Diminishings:GetOptions() min = 0, max = 10, step = 0.1, + width = "full", }), }, }, @@ -431,6 +434,7 @@ function Diminishings:GetOptions() max = 1, step = 0.1, order = 9, + width = "full", }), }, }, @@ -467,6 +471,7 @@ function Diminishings:GetOptions() min = 0.1, max = 2, step = 0.1, + width = "full", }), } }, @@ -502,6 +507,7 @@ function Diminishings:GetOptions() min = -400, max = 400, step = 0.1, + width = "full", }), drYOffset = Gladdy:option({ type = "range", @@ -510,6 +516,7 @@ function Diminishings:GetOptions() min = -400, max = 400, step = 0.1, + width = "full", }), }, }, diff --git a/Modules/Healthbar.lua b/Modules/Healthbar.lua index b10fa1e..b07ac40 100644 --- a/Modules/Healthbar.lua +++ b/Modules/Healthbar.lua @@ -368,6 +368,7 @@ function Healthbar:GetOptions() min = 10, max = 100, step = 1, + width = "full", }), healthBarTexture = option({ type = "select", @@ -419,6 +420,7 @@ function Healthbar:GetOptions() step = 0.1, min = 0, max = 20, + width = "full", }), healthBarHealthFontSize = option({ type = "range", @@ -428,6 +430,7 @@ function Healthbar:GetOptions() step = 0.1, min = 0, max = 20, + width = "full", }), }, }, @@ -456,6 +459,7 @@ function Healthbar:GetOptions() min = 0.5, max = Gladdy.db.healthBarHeight/2, step = 0.5, + width = "full", }), healthBarBorderColor = Gladdy:colorOption({ type = "color", diff --git a/Modules/Pets.lua b/Modules/Pets.lua index 7e04763..5c2e5b4 100644 --- a/Modules/Pets.lua +++ b/Modules/Pets.lua @@ -156,7 +156,7 @@ function Pets:CreateFrame(unitId) healthBar:SetAllPoints(button) healthBar:SetAlpha(0) - healthBar.portrait = healthBar:CreateTexture(nil, "OVERLAY") + healthBar.portrait = healthBar:CreateTexture(nil, "BACKGROUND") healthBar.portrait:SetPoint("LEFT", healthBar, "RIGHT") healthBar.portrait:SetTexCoord(0.1, 0.9, 0.1, 0.9) SetPortraitTexture(healthBar.portrait, "player") @@ -368,6 +368,7 @@ function Pets:GetOptions() min = 10, max = 100, step = 1, + width = "full", }), petWidth = option({ type = "range", @@ -377,6 +378,7 @@ function Pets:GetOptions() min = 10, max = 300, step = 1, + width = "full", }), petHealthBarTexture = option({ type = "select", @@ -458,6 +460,7 @@ function Pets:GetOptions() order = 13, min = 0, max = 20, + width = "full", }), }, }, @@ -486,6 +489,7 @@ function Pets:GetOptions() min = 0.5, max = Gladdy.db.petHeight/2, step = 0.5, + width = "full", }), petHealthBarBorderColor = Gladdy:colorOption({ type = "color", @@ -513,6 +517,7 @@ function Pets:GetOptions() min = -600, max = 600, step = 0.1, + width = "full", }), petYOffset = Gladdy:option({ type = "range", @@ -521,6 +526,7 @@ function Pets:GetOptions() min = -600, max = 600, step = 0.1, + width = "full", }), } }, diff --git a/Modules/Racial.lua b/Modules/Racial.lua index b5e1f27..7172c88 100644 --- a/Modules/Racial.lua +++ b/Modules/Racial.lua @@ -62,12 +62,12 @@ local function iconTimer(self,elapsed) elseif timeLeft <= 10 and timeLeft >= 5 then -- between 10s and 5s (orange) self.cooldownFont:SetTextColor(1, 0.7, 0) - self.cooldownFont:SetFormattedText("%.1f", timeLeft) + self.cooldownFont:SetFormattedText("%.1f", self.timeLeft) self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE") elseif timeLeft < 5 and timeLeft > 0 then -- between 5s and 1s (red) self.cooldownFont:SetTextColor(1, 0, 0) - self.cooldownFont:SetFormattedText("%.1f", timeLeft >= 0.0 and timeLeft or 0.0) + self.cooldownFont:SetFormattedText("%.1f", self.timeLeft >= 0.0 and self.timeLeft or 0.0) self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.racialFont), (self:GetWidth()/2 - 1) * Gladdy.db.racialFontScale, "OUTLINE") else self.cooldownFont:SetText("") @@ -246,6 +246,7 @@ function Racial:GetOptions() max = 100, step = 1, order = 2, + width = "full", }), racialWidthFactor = Gladdy:option({ type = "range", @@ -254,6 +255,7 @@ function Racial:GetOptions() max = 2, step = 0.05, order = 3, + width = "full", }), }, }, @@ -280,6 +282,7 @@ function Racial:GetOptions() max = 1, step = 0.1, order = 8, + width = "full", }), }, }, @@ -309,6 +312,7 @@ function Racial:GetOptions() min = 0.1, max = 2, step = 0.1, + width = "full", }), }, }, @@ -353,6 +357,7 @@ function Racial:GetOptions() min = -400, max = 400, step = 0.1, + width = "full", }), racialYOffset = Gladdy:option({ type = "range", @@ -361,6 +366,7 @@ function Racial:GetOptions() min = -400, max = 400, step = 0.1, + width = "full", }), }, }, diff --git a/Modules/Trinket.lua b/Modules/Trinket.lua index 2158e37..b0078a8 100644 --- a/Modules/Trinket.lua +++ b/Modules/Trinket.lua @@ -56,12 +56,12 @@ local function iconTimer(self, elapsed) elseif timeLeft <= 10 and timeLeft >= 5 then -- between 10s and 5s (orange) self.cooldownFont:SetTextColor(1, 0.7, 0) - self.cooldownFont:SetFormattedText("%.1f", timeLeft) + self.cooldownFont:SetFormattedText("%.1f", self.timeLeft) self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE") elseif timeLeft < 5 and timeLeft > 0 then -- between 5s and 1s (red) self.cooldownFont:SetTextColor(1, 0, 0) - self.cooldownFont:SetFormattedText("%.1f", timeLeft >= 0.0 and timeLeft or 0.0) + self.cooldownFont:SetFormattedText("%.1f", self.timeLeft >= 0.0 and self.timeLeft or 0.0) self.cooldownFont:SetFont(Gladdy.LSM:Fetch("font", Gladdy.db.trinketFont), (self:GetWidth()/2 - 1) * Gladdy.db.trinketFontScale, "OUTLINE") else self.cooldownFont:SetText("") @@ -249,6 +249,7 @@ function Trinket:GetOptions() max = 100, step = 1, order = 4, + width = "full", }), trinketWidthFactor = Gladdy:option({ type = "range", @@ -257,6 +258,7 @@ function Trinket:GetOptions() max = 2, step = 0.05, order = 6, + width = "full", }), }, }, @@ -283,6 +285,7 @@ function Trinket:GetOptions() max = 1, step = 0.1, order = 8, + width = "full", }), }, }, @@ -312,6 +315,7 @@ function Trinket:GetOptions() min = 0.1, max = 2, step = 0.1, + width = "full", }), }, }, diff --git a/Modules/XiconProfiles.lua b/Modules/XiconProfiles.lua index b13264a..9f30f99 100644 --- a/Modules/XiconProfiles.lua +++ b/Modules/XiconProfiles.lua @@ -27,7 +27,7 @@ end function XiconProfiles:ApplyClassic() local deserialized = Gladdy.modules["Export Import"]:Decode(Gladdy:GetClassicProfile()) if deserialized then - Gladdy.modules["ExportImport"]:ApplyImport(deserialized, Gladdy.db) + Gladdy.modules["Export Import"]:ApplyImport(deserialized, Gladdy.db) end Gladdy:Reset() Gladdy:HideFrame()