diff --git a/KkthnxUI/Config/AuraWatchGUI.lua b/KkthnxUI/Config/AuraWatchGUI.lua index 0f0af554..7024b48a 100644 --- a/KkthnxUI/Config/AuraWatchGUI.lua +++ b/KkthnxUI/Config/AuraWatchGUI.lua @@ -525,9 +525,9 @@ local function CreatePanel() -- Main local groups = { - L["Player Aura"], -- 1 PlayerBuff + -- L["Player Aura"], -- 1 PlayerBuff L["Special Aura"], -- 2 SPECIAL - L["Target Aura"], -- 3 TargetDebuff + -- L["Target Aura"], -- 3 TargetDebuff L["Warning"], -- 4 Warning L["Focus Aura"], -- 5 FOCUS L["Spell Cooldown"], -- 6 CD @@ -538,15 +538,15 @@ local function CreatePanel() } local preSet = { - [1] = { 1, false }, - [2] = { 1, true }, - [3] = { 2, true }, - [4] = { 2, false }, - [5] = { 3, false }, + --[1] = { 1, false }, + [1] = { 1, true }, + -- [3] = { 2, true }, + [2] = { 2, false }, + [3] = { 3, false }, + [4] = { 1, false }, + [5] = { 1, false }, [6] = { 1, false }, [7] = { 1, false }, - [8] = { 1, false }, - [9] = { 1, false }, } local tabs = {} @@ -750,7 +750,7 @@ local function CreatePanel() tabs[i]:SetScript("OnLeave", tabOnLeave) end - for i = 1, 10 do + for i = 1, 8 do createGroupSwitcher(tabs[i].Page, i) end diff --git a/KkthnxUI/Config/Elements/AuraWatchList/DH.lua b/KkthnxUI/Config/Elements/AuraWatchList/DH.lua index ee93b0b5..18fa1747 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/DH.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/DH.lua @@ -6,32 +6,6 @@ if K.Class ~= "DEMONHUNTER" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 207693, UnitID = "player" }, -- 灵魂盛宴 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 198813, UnitID = "target", Caster = "player" }, -- 复仇回避 - { AuraID = 179057, UnitID = "target", Caster = "player" }, -- 混乱新星 - { AuraID = 207690, UnitID = "target", Caster = "player" }, -- 血滴子 - { AuraID = 206491, UnitID = "target", Caster = "player" }, -- 涅墨西斯 - { AuraID = 213405, UnitID = "target", Caster = "player" }, -- 战刃大师 - { AuraID = 185245, UnitID = "target", Caster = "player" }, -- 折磨 - { AuraID = 204490, UnitID = "target", Caster = "player" }, -- 沉默咒符 - { AuraID = 204598, UnitID = "target", Caster = "player" }, -- 烈焰咒符 - { AuraID = 204843, UnitID = "target", Caster = "player" }, -- 锁链咒符 - { AuraID = 207407, UnitID = "target", Caster = "player" }, -- 灵魂切削 - { AuraID = 207744, UnitID = "target", Caster = "player" }, -- 烈火烙印 - { AuraID = 207771, UnitID = "target", Caster = "player" }, -- 烈火烙印 - { AuraID = 224509, UnitID = "target", Caster = "player" }, -- 幽魂炸弹 - { AuraID = 210003, UnitID = "target", Caster = "player" }, -- 锋锐之刺 - { AuraID = 207685, UnitID = "target", Caster = "player" }, -- 悲苦咒符 - { AuraID = 211881, UnitID = "target", Caster = "player" }, -- 邪能爆发 - { AuraID = 247456, UnitID = "target", Caster = "player" }, -- 脆弱 - { AuraID = 258860, UnitID = "target", Caster = "player" }, -- 黑暗鞭笞 - { AuraID = 268178, UnitID = "target", Caster = "player" }, -- 虚空掠夺者 - { AuraID = 323802, UnitID = "target", Caster = "player" }, -- 恶魔追击 - { AuraID = 317009, UnitID = "target", Caster = "player" }, -- 罪孽烙印 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 162264, UnitID = "player" }, -- 恶魔变形 { AuraID = 187827, UnitID = "player" }, -- 恶魔变形 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/DK.lua b/KkthnxUI/Config/Elements/AuraWatchList/DK.lua index 1951f44f..f50f15e3 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/DK.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/DK.lua @@ -6,32 +6,6 @@ if K.Class ~= "DEATHKNIGHT" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 3714, UnitID = "player" }, -- 冰霜之路 - { AuraID = 53365, UnitID = "player" }, -- 不洁之力 - { AuraID = 59052, UnitID = "player" }, -- 白霜 - { AuraID = 81340, UnitID = "player" }, -- 末日突降 - { AuraID = 111673, UnitID = "pet" }, -- 控制亡灵 - { AuraID = 215377, UnitID = "player" }, -- 巨口饿了 - { AuraID = 219788, UnitID = "player" }, -- 埋骨之所 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 55078, UnitID = "target", Caster = "player" }, -- 血之疫病 - { AuraID = 55095, UnitID = "target", Caster = "player" }, -- 冰霜疫病 - { AuraID = 56222, UnitID = "target", Caster = "player" }, -- 黑暗命令 - { AuraID = 45524, UnitID = "target", Caster = "player" }, -- 寒冰锁链 - { AuraID = 191587, UnitID = "target", Caster = "player" }, -- 恶性瘟疫 - { AuraID = 211793, UnitID = "target", Caster = "player" }, -- 冷库严冬 - { AuraID = 221562, UnitID = "target", Caster = "player" }, -- 窒息 - { AuraID = 108194, UnitID = "target", Caster = "player" }, -- 窒息 - { AuraID = 206940, UnitID = "target", Caster = "player" }, -- 鲜血印记 - { AuraID = 206977, UnitID = "target", Caster = "player" }, -- 血之镜像 - { AuraID = 207167, UnitID = "target", Caster = "player" }, -- 致盲冰雨 - { AuraID = 194310, UnitID = "target", Caster = "player" }, -- 溃烂之伤 - { AuraID = 156004, UnitID = "target", Caster = "player" }, -- 亵渎 - { AuraID = 191748, UnitID = "target", Caster = "player" }, -- 诸界之灾 - { AuraID = 312202, UnitID = "target", Caster = "player" }, -- 失格者之梏 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 63560, UnitID = "pet" }, -- 黑暗突变 { AuraID = 47568, UnitID = "player" }, -- 符文武器增效 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Druid.lua b/KkthnxUI/Config/Elements/AuraWatchList/Druid.lua index 066deed4..cc0957ee 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Druid.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Druid.lua @@ -6,50 +6,6 @@ if K.Class ~= "DRUID" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 5215, UnitID = "player" }, -- 潜行 - { AuraID = 1850, UnitID = "player" }, -- 急奔 - { AuraID = 137452, UnitID = "player" }, -- 野性位移 - { AuraID = 102416, UnitID = "player" }, -- 野性冲锋：泳速 - { AuraID = 774, UnitID = "player", Caster = "player" }, -- 回春术 - { AuraID = 8936, UnitID = "player", Caster = "player" }, -- 愈合 - { AuraID = 33763, UnitID = "player", Caster = "player" }, -- 生命绽放 - { AuraID = 188550, UnitID = "player", Caster = "player" }, -- 生命绽放，橙装 - { AuraID = 48438, UnitID = "player", Caster = "player" }, -- 野性成长 - { AuraID = 102351, UnitID = "player", Caster = "player" }, -- 塞纳里奥结界 - { AuraID = 155777, UnitID = "player", Caster = "player" }, -- 萌芽 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 99, UnitID = "target", Caster = "player" }, -- 夺魂咆哮 - { AuraID = 339, UnitID = "target", Caster = "player" }, -- 纠缠根须 - { AuraID = 774, UnitID = "target", Caster = "player" }, -- 回春术 - { AuraID = 1079, UnitID = "target", Caster = "player" }, -- 割裂 - { AuraID = 5211, UnitID = "target", Caster = "player" }, -- 蛮力猛击 - { AuraID = 6795, UnitID = "target", Caster = "player" }, -- 低吼 - { AuraID = 8936, UnitID = "target", Caster = "player" }, -- 愈合 - { AuraID = 50259, UnitID = "target", Caster = "player" }, -- 野性冲锋：晕眩 - { AuraID = 45334, UnitID = "target", Caster = "player" }, -- 野性冲锋：定身 - { AuraID = 33763, UnitID = "target", Caster = "player" }, -- 生命绽放 - { AuraID = 188550, UnitID = "target", Caster = "player" }, -- 生命绽放，橙装 - { AuraID = 48438, UnitID = "target", Caster = "player" }, -- 野性成长 - { AuraID = 61391, UnitID = "target", Caster = "player" }, -- 台风 - { AuraID = 81261, UnitID = "target", Caster = "player" }, -- 日光术 - { AuraID = 155722, UnitID = "target", Caster = "player" }, -- 斜掠 - { AuraID = 203123, UnitID = "target", Caster = "player" }, -- 割碎 - { AuraID = 106830, UnitID = "target", Caster = "player" }, -- 痛击 - { AuraID = 192090, UnitID = "target", Caster = "player" }, -- 痛击 - { AuraID = 164812, UnitID = "target", Caster = "player" }, -- 月火术 - { AuraID = 155625, UnitID = "target", Caster = "player" }, -- 月火术 - { AuraID = 164815, UnitID = "target", Caster = "player" }, -- 阳炎术 - { AuraID = 102359, UnitID = "target", Caster = "player" }, -- 群体缠绕 - { AuraID = 202347, UnitID = "target", Caster = "player" }, -- 星辰耀斑 - { AuraID = 127797, UnitID = "target", Caster = "player" }, -- 乌索尔旋风 - { AuraID = 208253, UnitID = "target", Caster = "player" }, -- 加尼尔的精华 - { AuraID = 155777, UnitID = "target", Caster = "player" }, -- 萌芽 - { AuraID = 102342, UnitID = "target", Caster = "player" }, -- 铁木树皮 - { AuraID = 102351, UnitID = "target", Caster = "player" }, -- 塞纳里奥结界 - { AuraID = 200389, UnitID = "target", Caster = "player" }, -- 栽培 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 5217, UnitID = "player" }, -- 猛虎之怒 { AuraID = 48517, UnitID = "player" }, -- 日蚀 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Evoker.lua b/KkthnxUI/Config/Elements/AuraWatchList/Evoker.lua index a1605805..999150ca 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Evoker.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Evoker.lua @@ -6,15 +6,6 @@ if K.Class ~= "EVOKER" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 370454, UnitID = "player" }, -- 聚能冲击 - { AuraID = 370840, UnitID = "player" }, -- 移情者 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 355689, UnitID = "target", Caster = "player" }, -- 山崩 - { AuraID = 372048, UnitID = "target", Caster = "player" }, -- 压迫怒吼 - { AuraID = 370452, UnitID = "target", Caster = "player" }, -- 碎裂星辰 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 358267, UnitID = "player" }, -- 悬空 { AuraID = 375087, UnitID = "player" }, -- 狂龙之怒 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Hunter.lua b/KkthnxUI/Config/Elements/AuraWatchList/Hunter.lua index 6e670d19..9bc220f8 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Hunter.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Hunter.lua @@ -6,70 +6,6 @@ if K.Class ~= "HUNTER" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 136, UnitID = "pet" }, -- 治疗宠物 - { AuraID = 19577, UnitID = "pet" }, -- 胁迫 - { AuraID = 160058, UnitID = "pet" }, -- 厚皮 - { AuraID = 90361, UnitID = "player" }, -- 灵魂治愈 - { AuraID = 35079, UnitID = "player" }, -- 误导 - { AuraID = 61648, UnitID = "player" }, -- 变色龙守护 - { AuraID = 199483, UnitID = "player" }, -- 伪装 - { AuraID = 118922, UnitID = "player" }, -- 迅疾如风 - { AuraID = 164857, UnitID = "player" }, -- 生存专家 - { AuraID = 186258, UnitID = "player" }, -- 猎豹守护 - { AuraID = 246152, UnitID = "player" }, -- 倒刺射击 - { AuraID = 246851, UnitID = "player" }, -- 倒刺射击 - { AuraID = 246852, UnitID = "player" }, -- 倒刺射击 - { AuraID = 246853, UnitID = "player" }, -- 倒刺射击 - { AuraID = 246854, UnitID = "player" }, -- 倒刺射击 - { AuraID = 203924, UnitID = "player" }, -- 守护屏障 - { AuraID = 197161, UnitID = "player" }, -- 灵龟守护回血 - { AuraID = 160007, UnitID = "player" }, -- 上升气流（双头龙） - { AuraID = 260249, UnitID = "player" }, -- 掠食者 - { AuraID = 231390, UnitID = "player", Combat = true }, -- 开拓者 - { AuraID = 164273, UnitID = "player", Combat = true, Value = true }, -- 独来独往 - { AuraID = 260242, UnitID = "player" }, -- 弹无虚发 - { AuraID = 342076, UnitID = "player" }, -- 行云流水 - { AuraID = 389020, UnitID = "player" }, -- 子弹风暴 - { AuraID = 424571, UnitID = "player" }, -- 风行者的指引 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 3355, UnitID = "target", Caster = "player" }, -- 冰冻陷阱 - { AuraID = 5116, UnitID = "target", Caster = "player" }, -- 震荡射击 - { AuraID = 19386, UnitID = "target", Caster = "player" }, -- 翼龙钉刺 - { AuraID = 24394, UnitID = "target", Caster = "pet" }, -- 胁迫 - { AuraID = 321538, UnitID = "target", Caster = "pet" }, -- 血溅十方 - { AuraID = 117526, UnitID = "target" }, -- 束缚射击 - { AuraID = 257284, UnitID = "target", Caster = "player" }, -- 猎人印记 - { AuraID = 131894, UnitID = "target", Caster = "player" }, -- 夺命黑鸦 - { AuraID = 199803, UnitID = "target", Caster = "player" }, -- 精确瞄准 - { AuraID = 195645, UnitID = "target", Caster = "player" }, -- 摔绊 - { AuraID = 202797, UnitID = "target", Caster = "player" }, -- 蝰蛇钉刺 - { AuraID = 202900, UnitID = "target", Caster = "player" }, -- 毒蝎钉刺 - { AuraID = 224729, UnitID = "target", Caster = "player" }, -- 爆裂射击 - { AuraID = 213691, UnitID = "target", Caster = "player" }, -- 驱散射击 - { AuraID = 162480, UnitID = "target", Caster = "player" }, -- 精钢陷阱 - { AuraID = 162487, UnitID = "target", Caster = "player" }, -- 精钢陷阱 - { AuraID = 259491, UnitID = "target", Caster = "player" }, -- 毒蛇钉刺 - { AuraID = 271788, UnitID = "target", Caster = "player" }, -- 毒蛇钉刺 - { AuraID = 269747, UnitID = "target", Caster = "player" }, -- 野火炸弹 - { AuraID = 270339, UnitID = "target", Caster = "player" }, -- 散射炸弹 - { AuraID = 270343, UnitID = "target", Caster = "player" }, -- 内出血 - { AuraID = 271049, UnitID = "target", Caster = "player" }, -- 动荡炸弹 - { AuraID = 270332, UnitID = "target", Caster = "player", Flash = true }, -- 信息素炸弹 - --{AuraID = 259277, UnitID = "target", Caster = "pet"}, -- 杀戮命令 - { AuraID = 277959, UnitID = "target", Caster = "player" }, -- 稳固瞄准 - { AuraID = 217200, UnitID = "target", Caster = "player" }, -- 倒刺射击 - { AuraID = 336746, UnitID = "target", Caster = "player" }, -- 魂铸余烬，橙装 - { AuraID = 328275, UnitID = "target", Caster = "player" }, -- 野性印记 - { AuraID = 324149, UnitID = "target", Caster = "player" }, -- 劫掠射击 - { AuraID = 308498, UnitID = "target", Caster = "player" }, -- 共鸣箭 - { AuraID = 333526, UnitID = "target", Caster = "player" }, -- 尖刺果实 - { AuraID = 375893, UnitID = "target", Caster = "player" }, -- 死亡飞轮 - { AuraID = 424567, UnitID = "target", Caster = "player", Flash = true }, -- 狂野本能 - - { AuraID = 410167, UnitID = "target", Caster = "player" }, -- 破甲，生存4T - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 19574, UnitID = "player" }, -- 狂野怒火 { AuraID = 54216, UnitID = "player" }, -- 主人的召唤 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Mage.lua b/KkthnxUI/Config/Elements/AuraWatchList/Mage.lua index 8e0ad210..87089279 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Mage.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Mage.lua @@ -6,47 +6,6 @@ if K.Class ~= "MAGE" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 130, UnitID = "player" }, -- 缓落 - { AuraID = 32612, UnitID = "player" }, -- 隐形术 - { AuraID = 87023, UnitID = "player" }, -- 灸灼 - { AuraID = 11426, UnitID = "player" }, -- 寒冰护体 - { AuraID = 235313, UnitID = "player" }, -- 烈焰护体 - { AuraID = 235450, UnitID = "player" }, -- 棱光屏障 - { AuraID = 110960, UnitID = "player" }, -- 强化隐形术 - { AuraID = 157644, UnitID = "player" }, -- 强化烟火之术 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 118, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 122, UnitID = "target", Caster = "player" }, -- 冰霜新星 - { AuraID = 12654, UnitID = "target", Caster = "player" }, -- 点燃 - { AuraID = 11366, UnitID = "target", Caster = "player" }, -- 炎爆术 - { AuraID = 31661, UnitID = "target", Caster = "player" }, -- 龙息术 - { AuraID = 82691, UnitID = "target", Caster = "player" }, -- 冰霜之环 - { AuraID = 31589, UnitID = "target", Caster = "player" }, -- 减速 - { AuraID = 33395, UnitID = "target", Caster = "pet" }, -- 冰冻术 - { AuraID = 28271, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 28272, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 61305, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 61721, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 61780, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 126819, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 161353, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 161354, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 161355, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 161372, UnitID = "target", Caster = "player" }, -- 变形术 - { AuraID = 157981, UnitID = "target", Caster = "player" }, -- 冲击波 - { AuraID = 217694, UnitID = "target", Caster = "player" }, -- 活动炸弹 - { AuraID = 114923, UnitID = "target", Caster = "player" }, -- 虚空风暴 - { AuraID = 205708, UnitID = "target", Caster = "player" }, -- 寒冰箭 - { AuraID = 212792, UnitID = "target", Caster = "player" }, -- 冰锥术 - { AuraID = 157997, UnitID = "target", Caster = "player" }, -- 寒冰新星 - { AuraID = 210134, UnitID = "target", Caster = "player" }, -- 奥术侵蚀 - { AuraID = 199786, UnitID = "target", Caster = "player" }, -- 冰川尖刺 - { AuraID = 210824, UnitID = "target", Caster = "player" }, -- 大法师之触 - { AuraID = 307443, UnitID = "target", Caster = "player" }, -- 摧残火花 - { AuraID = 314793, UnitID = "target", Caster = "player" }, -- 折磨之镜 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 66, UnitID = "player" }, -- 隐形术 { AuraID = 45438, UnitID = "player" }, -- 寒冰屏障 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Monk.lua b/KkthnxUI/Config/Elements/AuraWatchList/Monk.lua index 3f285bf1..b969407e 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Monk.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Monk.lua @@ -6,35 +6,6 @@ if K.Class ~= "MONK" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 119085, UnitID = "player" }, -- 真气突 - { AuraID = 101643, UnitID = "player" }, -- 魂体双分 - { AuraID = 202090, UnitID = "player" }, -- 禅院教诲 - { AuraID = 119611, UnitID = "player" }, -- 复苏之雾 - { AuraID = 195381, UnitID = "player" }, -- 治疗之风 - { AuraID = 213177, UnitID = "player" }, -- 利涉大川 - { AuraID = 199407, UnitID = "player" }, -- 脚步轻盈 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 115078, UnitID = "target", Caster = "player" }, -- 分筋错骨 - { AuraID = 116189, UnitID = "target", Caster = "player" }, -- 豪镇八方 - { AuraID = 115804, UnitID = "target", Caster = "player" }, -- 致死之伤 - { AuraID = 115080, UnitID = "target", Caster = "player" }, -- 轮回之触 - { AuraID = 123586, UnitID = "target", Caster = "player" }, -- 翔龙在天 - { AuraID = 116706, UnitID = "target", Caster = "player" }, -- 金刚震 - { AuraID = 205320, UnitID = "target", Caster = "player" }, -- 风领主之击 - { AuraID = 116841, UnitID = "target", Caster = "player" }, -- 迅如猛虎 - { AuraID = 119381, UnitID = "target", Caster = "player" }, -- 扫堂腿 - { AuraID = 116844, UnitID = "target", Caster = "player" }, -- 平心之环 - { AuraID = 121253, UnitID = "target", Caster = "player" }, -- 醉酿投 - { AuraID = 214326, UnitID = "target", Caster = "player" }, -- 爆炸酒桶 - { AuraID = 123725, UnitID = "target", Caster = "player" }, -- 火焰之息 - { AuraID = 116849, UnitID = "target", Caster = "player" }, -- 作茧缚命 - { AuraID = 119611, UnitID = "target", Caster = "player" }, -- 复苏之雾 - { AuraID = 191840, UnitID = "target", Caster = "player" }, -- 精华之泉 - { AuraID = 198909, UnitID = "target", Caster = "player" }, -- 赤精之歌 - { AuraID = 124682, UnitID = "target", Caster = "player" }, -- 氤氲之雾 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 125174, UnitID = "player" }, -- 业报之触 { AuraID = 116768, UnitID = "player" }, -- 幻灭踢 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Paladin.lua b/KkthnxUI/Config/Elements/AuraWatchList/Paladin.lua index 903979c4..5b0121af 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Paladin.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Paladin.lua @@ -6,33 +6,6 @@ if K.Class ~= "PALADIN" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 188370, UnitID = "player" }, -- 奉献 - { AuraID = 197561, UnitID = "player" }, -- 复仇者的勇气 - { AuraID = 269571, UnitID = "player" }, -- 狂热 - { AuraID = 114250, UnitID = "player" }, -- 无私自愈 - { AuraID = 281178, UnitID = "player" }, -- 愤怒之剑 - { AuraID = 182104, UnitID = "player" }, -- 闪耀之光 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 853, UnitID = "target", Caster = "player" }, -- 制裁之锤 - { AuraID = 31935, UnitID = "target", Caster = "player" }, -- 复仇者之盾 - { AuraID = 53563, UnitID = "target", Caster = "player" }, -- 圣光道标 - { AuraID = 62124, UnitID = "target", Caster = "player" }, -- 清算之手 - { AuraID = 156910, UnitID = "target", Caster = "player" }, -- 信仰道标 - { AuraID = 183218, UnitID = "target", Caster = "player" }, -- 妨害之手 - { AuraID = 197277, UnitID = "target", Caster = "player" }, -- 审判 - { AuraID = 214222, UnitID = "target", Caster = "player" }, -- 审判 - { AuraID = 205273, UnitID = "target", Caster = "player" }, -- 灰烬觉醒 - { AuraID = 105421, UnitID = "target", Caster = "player" }, -- 盲目之光 - { AuraID = 200654, UnitID = "target", Caster = "player" }, -- 提尔的拯救 - { AuraID = 223306, UnitID = "target", Caster = "player" }, -- 赋予信仰 - { AuraID = 196941, UnitID = "target", Caster = "player" }, -- 圣光审判 - { AuraID = 209202, UnitID = "target", Caster = "player" }, -- 提尔之眼 - { AuraID = 204301, UnitID = "target", Caster = "player" }, -- 祝福之盾 - { AuraID = 204079, UnitID = "target", Caster = "player" }, -- 决一死战 - { AuraID = 343527, UnitID = "target", Caster = "player" }, -- 处决审判 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 498, UnitID = "player" }, -- 圣佑术 { AuraID = 642, UnitID = "player" }, -- 圣盾术 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Priest.lua b/KkthnxUI/Config/Elements/AuraWatchList/Priest.lua index 37630ea8..d4da5cc5 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Priest.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Priest.lua @@ -6,40 +6,6 @@ if K.Class ~= "PRIEST" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 586, UnitID = "player" }, -- 渐隐术 - { AuraID = 45242, UnitID = "player" }, -- 专注意志 - { AuraID = 121557, UnitID = "player" }, -- 天堂之羽 - { AuraID = 194022, UnitID = "player" }, -- 意志坚定 - { AuraID = 214121, UnitID = "player" }, -- 身心合一 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 139, UnitID = "target", Caster = "player" }, -- 恢复 - { AuraID = 589, UnitID = "target", Caster = "player" }, -- 暗言术:痛 - { AuraID = 8122, UnitID = "target", Caster = "player" }, -- 心灵尖啸 - { AuraID = 15487, UnitID = "target", Caster = "player" }, -- 沉默 - { AuraID = 34914, UnitID = "target", Caster = "player" }, -- 吸血鬼之触 - { AuraID = 41635, UnitID = "target", Caster = "player" }, -- 愈合祷言 - { AuraID = 205369, UnitID = "target", Caster = "player" }, -- 心灵炸弹 - { AuraID = 217673, UnitID = "target", Caster = "player" }, -- 心灵尖刺 - { AuraID = 208065, UnitID = "target", Caster = "player" }, -- 图雷之光 - { AuraID = 200196, UnitID = "target", Caster = "player" }, -- 圣言术：罚 - { AuraID = 200200, UnitID = "target", Caster = "player" }, -- 圣言术：罚 - { AuraID = 214121, UnitID = "target", Caster = "player" }, -- 身心合一 - { AuraID = 121557, UnitID = "target", Caster = "player" }, -- 天堂之羽 - { AuraID = 204263, UnitID = "target", Caster = "player" }, -- 闪光力场 - { AuraID = 194384, UnitID = "target", Caster = "player" }, -- 救赎 - { AuraID = 214621, UnitID = "target", Caster = "player" }, -- 教派分歧 - { AuraID = 152118, UnitID = "target", Caster = "player" }, -- 意志洞悉 - { AuraID = 204213, UnitID = "target", Caster = "player" }, -- 净化邪恶 - { AuraID = 335467, UnitID = "target", Caster = "player" }, -- 噬灵疫病 - { AuraID = 323673, UnitID = "target", Caster = "player" }, -- 控心术 - { AuraID = 342132, UnitID = "target", Caster = "player" }, -- 盛怒法夜 - { AuraID = 325203, UnitID = "target", Caster = "player" }, -- 邪恶灌注 - { AuraID = 17, UnitID = "target", Caster = "player", Value = true }, -- 真言术：盾 - { AuraID = 208772, UnitID = "target", Caster = "player", Value = true }, -- 惩击 - { AuraID = 271466, UnitID = "target", Caster = "player", Value = true }, -- 微光屏障 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 17, UnitID = "player", Caster = "player" }, -- 真言术：盾 { AuraID = 194384, UnitID = "player", Caster = "player" }, -- 救赎 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Rogue.lua b/KkthnxUI/Config/Elements/AuraWatchList/Rogue.lua index aa1ebdc9..55b4dc21 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Rogue.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Rogue.lua @@ -6,43 +6,6 @@ if K.Class ~= "ROGUE" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 1784, UnitID = "player" }, -- 潜行 - { AuraID = 115191, UnitID = "player" }, -- 潜行 - { AuraID = 2983, UnitID = "player" }, -- 疾跑 - { AuraID = 36554, UnitID = "player" }, -- 暗影步 - { AuraID = 197603, UnitID = "player" }, -- 黑暗之拥 - { AuraID = 270070, UnitID = "player" }, -- 隐藏之刃 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 408, UnitID = "target", Caster = "player" }, -- 肾击 - { AuraID = 703, UnitID = "target", Caster = "player" }, -- 锁喉 - { AuraID = 1833, UnitID = "target", Caster = "player" }, -- 偷袭 - { AuraID = 6770, UnitID = "target", Caster = "player" }, -- 闷棍 - { AuraID = 2094, UnitID = "target", Caster = "player" }, -- 致盲 - { AuraID = 1330, UnitID = "target", Caster = "player" }, -- 锁喉 - { AuraID = 1776, UnitID = "target", Caster = "player" }, -- 凿击 - { AuraID = 1943, UnitID = "target", Caster = "player" }, -- 割裂 - { AuraID = 79140, UnitID = "target", Caster = "player" }, -- 宿敌 - { AuraID = 16511, UnitID = "target", Caster = "player" }, -- 出血 - { AuraID = 192759, UnitID = "target", Caster = "player" }, -- 君王之灾 - { AuraID = 192425, UnitID = "target", Caster = "player" }, -- 毒素冲动 - { AuraID = 200803, UnitID = "target", Caster = "player" }, -- 苦痛毒液 - { AuraID = 137619, UnitID = "target", Caster = "player" }, -- 死亡标记 - { AuraID = 195452, UnitID = "target", Caster = "player" }, -- 夜刃 - { AuraID = 209786, UnitID = "target", Caster = "player" }, -- 赤喉之咬 - { AuraID = 196958, UnitID = "target", Caster = "player" }, -- 暗影打击 - { AuraID = 196937, UnitID = "target", Caster = "player" }, -- 鬼魅攻击 - { AuraID = 192925, UnitID = "target", Caster = "player" }, -- 遇刺者之血 - { AuraID = 245389, UnitID = "target", Caster = "player" }, -- 淬毒之刃 - { AuraID = 121411, UnitID = "target", Caster = "player" }, -- 猩红风暴 - { AuraID = 255909, UnitID = "target", Caster = "player" }, -- 欺凌 - { AuraID = 316220, UnitID = "target", Caster = "player" }, -- 洞悉弱点 - { AuraID = 315341, UnitID = "target", Caster = "player" }, -- 正中眉心 - { AuraID = 328305, UnitID = "target", Caster = "player" }, -- 败血刃伤 - { AuraID = 323654, UnitID = "target", Caster = "player" }, -- Flagellation - { AuraID = 324073, UnitID = "target", Caster = "player" }, -- 锯齿骨刺 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 1966, UnitID = "player" }, -- 佯攻 { AuraID = 5171, UnitID = "player" }, -- 切割 @@ -64,7 +27,7 @@ local list = { { AuraID = 202754, UnitID = "player" }, -- 隐秘刀刃 { AuraID = 193356, UnitID = "player", Text = L["Combo"] }, -- 强势连击，骰子 { AuraID = 193357, UnitID = "player", Text = L["Crit"] }, -- 暗鲨涌动，骰子 - { AuraID = 193358, UnitID = "player", Text = L["AttackSpeed"] }, -- 大乱斗，骰子 + { AuraID = 193358, UnitID = "player", Text = L["Attack Speed"] }, -- 大乱斗，骰子 { AuraID = 193359, UnitID = "player", Text = L["CD"] }, -- 双巧手，骰子 { AuraID = 199603, UnitID = "player", Text = L["Strike"] }, -- 骷髅黑帆，骰子 { AuraID = 199600, UnitID = "player", Text = L["Power"] }, -- 埋藏的宝藏，骰子 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Shaman.lua b/KkthnxUI/Config/Elements/AuraWatchList/Shaman.lua index c5e22ef2..f3ee6e4c 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Shaman.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Shaman.lua @@ -6,30 +6,6 @@ if K.Class ~= "SHAMAN" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 546, UnitID = "player" }, -- 水上行走 - { AuraID = 195222, UnitID = "player" }, -- 风暴之鞭 - { AuraID = 198293, UnitID = "player" }, -- 疾风 - { AuraID = 197211, UnitID = "player" }, -- 空气之怒 - { AuraID = 260881, UnitID = "player" }, -- 幽灵狼 - { AuraID = 192106, UnitID = "player", Timeless = true }, -- 闪电护盾 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 61295, UnitID = "target", Caster = "player" }, -- 激流 - { AuraID = 51514, UnitID = "target", Caster = "player" }, -- 妖术 - { AuraID = 210873, UnitID = "target", Caster = "player" }, -- 妖术 - { AuraID = 211004, UnitID = "target", Caster = "player" }, -- 妖术 - { AuraID = 211010, UnitID = "target", Caster = "player" }, -- 妖术 - { AuraID = 211015, UnitID = "target", Caster = "player" }, -- 妖术 - { AuraID = 188389, UnitID = "target", Caster = "player" }, -- 烈焰震击 - { AuraID = 118905, UnitID = "target", Caster = "player" }, -- 闪电奔涌图腾 - { AuraID = 188089, UnitID = "target", Caster = "player" }, -- 大地之刺 - { AuraID = 197209, UnitID = "target", Caster = "player" }, -- 避雷针 - { AuraID = 207778, UnitID = "target", Caster = "player" }, -- 蒺藜 - { AuraID = 207400, UnitID = "target", Caster = "player" }, -- 先祖活力 - { AuraID = 269808, UnitID = "target", Caster = "player" }, -- 元素外露 - { AuraID = 334168, UnitID = "target", Caster = "player" }, -- 鞭笞烈焰 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 73920, UnitID = "player" }, -- 治疗之雨 { AuraID = 53390, UnitID = "player" }, -- 潮汐奔涌 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Warlock.lua b/KkthnxUI/Config/Elements/AuraWatchList/Warlock.lua index 3652760d..f81f1846 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Warlock.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Warlock.lua @@ -6,45 +6,6 @@ if K.Class ~= "WARLOCK" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 5697, UnitID = "player" }, -- 无尽呼吸 - { AuraID = 48018, UnitID = "player" }, -- 恶魔法阵 - { AuraID = 108366, UnitID = "player" }, -- 灵魂榨取 - { AuraID = 119899, UnitID = "player" }, -- 灼烧主人 - { AuraID = 196099, UnitID = "player" }, -- 牺牲魔典 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 603, UnitID = "target", Caster = "player" }, -- 末日降临 - { AuraID = 980, UnitID = "target", Caster = "player" }, -- 痛楚 - { AuraID = 710, UnitID = "target", Caster = "player" }, -- 放逐术 - { AuraID = 6358, UnitID = "target", Caster = "pet" }, -- 魅惑 - { AuraID = 89766, UnitID = "target", Caster = "pet" }, -- 巨斧投掷 - { AuraID = 6789, UnitID = "target", Caster = "player" }, -- 死亡缠绕 - { AuraID = 5484, UnitID = "target", Caster = "player" }, -- 恐惧嚎叫 - { AuraID = 27243, UnitID = "target", Caster = "player" }, -- 腐蚀之种 - { AuraID = 17877, UnitID = "target", Caster = "player" }, -- 暗影灼烧 - { AuraID = 48181, UnitID = "target", Caster = "player" }, -- 鬼影缠身 - { AuraID = 63106, UnitID = "target", Caster = "player" }, -- 生命虹吸 - { AuraID = 30283, UnitID = "target", Caster = "player" }, -- 暗影之怒 - { AuraID = 32390, UnitID = "target", Caster = "player" }, -- 暗影之拥 - { AuraID = 80240, UnitID = "target", Caster = "player" }, -- 浩劫 - { AuraID = 146739, UnitID = "target", Caster = "player" }, -- 腐蚀术 - { AuraID = 316099, UnitID = "target", Caster = "player" }, -- 痛苦无常 - { AuraID = 342938, UnitID = "target", Caster = "player" }, -- 痛苦无常(PVP蔓延痛苦) - { AuraID = 118699, UnitID = "target", Caster = "player" }, -- 恐惧 - { AuraID = 205181, UnitID = "target", Caster = "player" }, -- 暗影烈焰 - { AuraID = 157736, UnitID = "target", Caster = "player" }, -- 献祭 - { AuraID = 196414, UnitID = "target", Caster = "player" }, -- 根除 - { AuraID = 199890, UnitID = "target", Caster = "player" }, -- 语言诅咒 - { AuraID = 199892, UnitID = "target", Caster = "player" }, -- 虚弱诅咒 - { AuraID = 270569, UnitID = "target", Caster = "player" }, -- 来自阴影 - { AuraID = 278350, UnitID = "target", Caster = "player" }, -- 邪恶污染 - { AuraID = 205179, UnitID = "target", Caster = "player" }, -- 诡异魅影 - { AuraID = 265931, UnitID = "target", Caster = "player" }, -- 燃烧 - { AuraID = 312321, UnitID = "target", Caster = "player" }, -- 碎魂奉纳 - { AuraID = 325640, UnitID = "target", Caster = "player" }, -- 灵魂腐化 - { AuraID = 322170, UnitID = "target", Caster = "player" }, -- 灾祸降临 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 89751, UnitID = "pet" }, -- 魔刃风暴 { AuraID = 216695, UnitID = "player" }, -- 被折磨的灵魂 diff --git a/KkthnxUI/Config/Elements/AuraWatchList/Warrior.lua b/KkthnxUI/Config/Elements/AuraWatchList/Warrior.lua index 470dc1e5..77a825cf 100644 --- a/KkthnxUI/Config/Elements/AuraWatchList/Warrior.lua +++ b/KkthnxUI/Config/Elements/AuraWatchList/Warrior.lua @@ -6,29 +6,6 @@ if K.Class ~= "WARRIOR" then end local list = { - ["Player Aura"] = { -- 玩家光环组 - { AuraID = 32216, UnitID = "player" }, -- 胜利 - { AuraID = 202602, UnitID = "player" }, -- 投入战斗 - { AuraID = 200954, UnitID = "player" }, -- 战争疤痕 - { AuraID = 202573, UnitID = "player" }, -- 报复 - { AuraID = 202574, UnitID = "player" }, -- 报复 - }, - ["Target Aura"] = { -- 目标光环组 - { AuraID = 355, UnitID = "target", Caster = "player" }, -- 嘲讽 - { AuraID = 772, UnitID = "target", Caster = "player" }, -- 撕裂 - { AuraID = 1715, UnitID = "target", Caster = "player" }, -- 断筋 - { AuraID = 1160, UnitID = "target", Caster = "player" }, -- 挫志怒吼 - { AuraID = 6343, UnitID = "target", Caster = "player" }, -- 雷霆一击 - { AuraID = 5246, UnitID = "target", Caster = "player" }, -- 破胆 - { AuraID = 12323, UnitID = "target", Caster = "player" }, -- 刺耳怒吼 - { AuraID = 105771, UnitID = "target", Caster = "player" }, -- 冲锋：定身 - { AuraID = 132169, UnitID = "target", Caster = "player" }, -- 风暴之锤 - { AuraID = 132168, UnitID = "target", Caster = "player" }, -- 震荡波 - { AuraID = 208086, UnitID = "target", Caster = "player" }, -- 巨人打击 - { AuraID = 115804, UnitID = "target", Caster = "player" }, -- 致死 - { AuraID = 280773, UnitID = "target", Caster = "player" }, -- 破城者 - { AuraID = 317491, UnitID = "target", Caster = "player", Value = true }, -- 有罪 - }, ["Special Aura"] = { -- 玩家重要光环组 { AuraID = 871, UnitID = "player" }, -- 盾墙 { AuraID = 1719, UnitID = "player" }, -- 战吼 diff --git a/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua b/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua index c9261f8f..49ee655c 100644 --- a/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua +++ b/KkthnxUI/Config/Elements/FilterLists/AuraWatchSpells.lua @@ -9,15 +9,24 @@ local UIParent = UIParent local AuraWatchList = {} local groups = { - ["Player Aura"] = { "LEFT", 6, "ICON", 30, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 432 } }, - ["Target Aura"] = { "RIGHT", 6, "ICON", 36, { "BOTTOMLEFT", UIParent, "BOTTOM", 160, 468 } }, - ["Special Aura"] = { "LEFT", 6, "ICON", 36, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 468 } }, + -- ["Player Aura"] = { "LEFT", 6, "ICON", 30, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 432 } }, + -- ["Target Aura"] = { "RIGHT", 6, "ICON", 36, { "BOTTOMLEFT", UIParent, "BOTTOM", 160, 468 } }, + -- ["Special Aura"] = { "LEFT", 6, "ICON", 36, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 468 } }, + -- ["Focus Aura"] = { "RIGHT", 6, "ICON", 35, { "BOTTOMLEFT", UIParent, "LEFT", 5, -230 } }, + -- ["Spell Cooldown"] = { "UP", 6, "BAR", 20, { "BOTTOMRIGHT", UIParent, "BOTTOM", -380, 140 }, 150 }, + -- ["Enchant Aura"] = { "LEFT", 6, "ICON", 36, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 510 } }, + -- ["Raid Buff"] = { "LEFT", 6, "ICON", 42, { "CENTER", UIParent, "CENTER", -220, 300 } }, + -- ["Raid Debuff"] = { "RIGHT", 6, "ICON", 42, { "CENTER", UIParent, "CENTER", 220, 300 } }, + -- ["Warning"] = { "RIGHT", 6, "ICON", 42, { "BOTTOMLEFT", UIParent, "BOTTOM", 160, 510 } }, + -- ["InternalCD"] = { "UP", 6, "BAR", 20, { "BOTTOMRIGHT", UIParent, "BOTTOM", -425, 600 }, 150 }, + + ["Special Aura"] = { "LEFT", 6, "ICON", 30, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 432 } }, ["Focus Aura"] = { "RIGHT", 6, "ICON", 35, { "BOTTOMLEFT", UIParent, "LEFT", 5, -230 } }, ["Spell Cooldown"] = { "UP", 6, "BAR", 20, { "BOTTOMRIGHT", UIParent, "BOTTOM", -380, 140 }, 150 }, - ["Enchant Aura"] = { "LEFT", 6, "ICON", 36, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 510 } }, + ["Enchant Aura"] = { "LEFT", 6, "ICON", 36, { "BOTTOMRIGHT", UIParent, "BOTTOM", -160, 468 } }, ["Raid Buff"] = { "LEFT", 6, "ICON", 42, { "CENTER", UIParent, "CENTER", -220, 300 } }, ["Raid Debuff"] = { "RIGHT", 6, "ICON", 42, { "CENTER", UIParent, "CENTER", 220, 300 } }, - ["Warning"] = { "RIGHT", 6, "ICON", 42, { "BOTTOMLEFT", UIParent, "BOTTOM", 160, 510 } }, + ["Warning"] = { "RIGHT", 6, "ICON", 36, { "BOTTOMLEFT", UIParent, "BOTTOM", 160, 468 } }, ["InternalCD"] = { "UP", 6, "BAR", 20, { "BOTTOMRIGHT", UIParent, "BOTTOM", -425, 600 }, 150 }, } diff --git a/KkthnxUI/Config/Elements/FilterLists/AutoQuest.lua b/KkthnxUI/Config/Elements/FilterLists/AutoQuest.lua index 5750819b..6d8ac7cb 100644 --- a/KkthnxUI/Config/Elements/FilterLists/AutoQuest.lua +++ b/KkthnxUI/Config/Elements/FilterLists/AutoQuest.lua @@ -2,48 +2,49 @@ local C = KkthnxUI[2] C.AutoQuestData = { IgnoreQuestNPC = { - [88570] = true, - [87391] = true, - [111243] = true, - [108868] = true, - [101462] = true, - [43929] = true, - [14847] = true, - [119388] = true, - [114719] = true, - [121263] = true, - [126954] = true, - [124312] = true, - [103792] = true, - [101880] = true, - [141584] = true, - [142063] = true, - [143388] = true, - [98489] = true, - [135690] = true, - [105387] = true, - [93538] = true, - [154534] = true, - [150987] = true, - [150563] = true, - [143555] = true, - [168430] = true, - [160248] = true, - [127037] = true, - [326027] = true, - [162804] = true, + [88570] = true, -- Fate-Twister Tiklal + [87391] = true, -- Fate-Twister Seress + [111243] = true, -- Archmage Lan'dalock + [108868] = true, -- Hunter's Order Hall + [101462] = true, -- Reaves + [43929] = true, -- 4000 + [14847] = true, -- Darkmoon + [119388] = true, -- Chief Hatton + [114719] = true, -- Merchant Selim + [121263] = true, -- Grand Artificer Rommel + [126954] = true, -- Tulayn + [124312] = true, -- Tulayn + [103792] = true, -- Grivata + [101880] = true, -- Tektek + [141584] = true, -- Zul'win + [142063] = true, -- Tezlan + [143388] = true, -- Drudza + [98489] = true, -- Shipwrecked Prisoner + [135690] = true, -- Undead Captain + [105387] = true, -- Andus + [93538] = true, -- Darynis + [154534] = true, -- Abandoned Slum Achang + [150987] = true, -- Shaun Vicks, Stratholme + [150563] = true, -- Skakite, Mecha Gun Order Daily + [143555] = true, -- Sand Hilberman, Zuldazar PvP Quartermaster + [168430] = true, -- Dakteris, Green Challenge + [160248] = true, -- Archivist Fian, Sinful Soul Fragment + [127037] = true, -- Nabiru + [326027] = true, -- Transport Station Recycling Generator DX-82 + [162804] = true, -- Ve'nari }, IgnoreGossipNPC = { - - [86945] = true, - [86933] = true, - [86927] = true, - [86934] = true, - [86682] = true, - [86964] = true, - [86946] = true, - + -- Bodyguards + [86945] = true, -- Aeda Brightdawn (Horde) + [86933] = true, -- Vivianne (Horde) + [86927] = true, -- Delvar Ironfist (Alliance) + [86934] = true, -- Defender Illona (Alliance) + [86682] = true, -- Tormmok + [86964] = true, -- Leorajh + [86946] = true, -- Talonpriest Ishaal + + -- Sassy Imps [95139] = true, [95141] = true, [95142] = true, @@ -54,119 +55,118 @@ C.AutoQuestData = { [95200] = true, [95201] = true, - [79740] = true, - [79953] = true, - [84268] = true, - [84511] = true, - [84684] = true, - [117871] = true, - [155101] = true, - [155261] = true, - [150122] = true, - [150131] = true, - - [173021] = true, - [171589] = true, - [171787] = true, - [171795] = true, - [171821] = true, - [172558] = true, - [172572] = true, - [175513] = true, - [165196] = true, - [180458] = true, - [182681] = true, - [183262] = true, - [184587] = true, + -- Misc NPCs + [79740] = true, -- Warmaster Zog (Horde) + [79953] = true, -- Lieutenant Thorn (Alliance) + [84268] = true, -- Lieutenant Thorn (Alliance) + [84511] = true, -- Lieutenant Thorn (Alliance) + [84684] = true, -- Lieutenant Thorn (Alliance) + [117871] = true, -- War Councilor Victoria (Class Challenges @ Broken Shore) + [155101] = true, -- Elemental Essence Integrator + [155261] = true, -- Shaun Vicks, Stratholme + [150122] = true, -- Honor Hold Mage + [150131] = true, -- Stormwind Mage + + [173021] = true, -- Glyphic Tauren + [171589] = true, -- General Draven + [171787] = true, -- Scribe Addalyce + [171795] = true, -- Countess Meara + [171821] = true, -- Baroness Draka + [172558] = true, -- Ela, the Pathfinder (Tutor) + [172572] = true, -- Theristra Balevine (Tutor) + [175513] = true, -- Naslya, Judicator of Pride + [165196] = true, -- Court of Ashes, Xy'tal + [180458] = true, -- Court of Ashes, Emperor's Illusion + [182681] = true, -- Zaremothides, Enhanced Console + [183262] = true, -- Zaremothides, Echomimic Originator + [184587] = true, -- Market, T'apiksh }, AutoSelectFirstOptionList = { - [97004] = true, - [96782] = true, - [93188] = true, - [107486] = true, - [167839] = true, - }, - - AutoGossipTypes = { - ["taxi"] = true, - ["gossip"] = true, - ["banker"] = true, - ["vendor"] = true, - ["trainer"] = true, + [97004] = true, -- "Red" Jack Findle, Rogue Class Hall + [96782] = true, -- Lucian Trias, Rogue Class Hall + [93188] = true, -- Mongar, Rogue Class Hall + [107486] = true, -- Stars' Private Investigator + [167839] = true, -- Soul Residue, Tower Climb }, IgnoreInstances = { - [1571] = true, - [1626] = true, + [1571] = true, -- Withered J'im + [1626] = true, -- Twisting Corridors }, SkipConfirmNPCs = { - [57850] = true, - [55382] = true, - [54334] = true, + [57850] = true, -- Teleportologist Fozlebub + [55382] = true, -- Darkmoon Faire Mystic Mage (Horde) + [54334] = true, -- Darkmoon Faire Mystic Mage (Alliance) }, ItemBlacklist = { - [31690] = 79343, - [31691] = 79340, - [31692] = 79341, - - [29443] = 71635, - [29444] = 71636, - [29445] = 71637, - [29446] = 71638, - [29451] = 71715, - [29456] = 71951, - [29457] = 71952, - [29458] = 71953, - [29464] = 71716, - - ["progress_79264"] = 79264, - ["progress_79265"] = 79265, - ["progress_79266"] = 79266, - ["progress_79267"] = 79267, - ["progress_79268"] = 79268, - - ["38180"] = 122424, - ["38193"] = 122423, - ["38182"] = 122418, - ["38196"] = 122417, - ["38179"] = 122400, - ["38192"] = 122404, - ["38194"] = 122420, - ["38202"] = 122419, - ["38178"] = 122402, - ["38191"] = 122406, - ["38184"] = 122413, - ["38198"] = 122414, - ["38177"] = 122403, - ["38190"] = 122399, - ["38181"] = 122421, - ["38195"] = 122422, - ["38185"] = 122411, - ["38199"] = 122409, - ["38187"] = 122412, - ["38201"] = 122410, - ["38186"] = 122408, - ["38200"] = 122407, - ["38183"] = 122416, - ["38197"] = 122415, - ["38176"] = 122405, - ["38189"] = 122401, - - [31664] = 88604, + -- Inscription weapons + [31690] = 79343, -- Inscribed Tiger Staff + [31691] = 79340, -- Inscribed Crane Staff + [31692] = 79341, -- Inscribed Serpent Staff + + -- Darkmoon Faire artifacts + [29443] = 71635, -- Imbued Crystal + [29444] = 71636, -- Monstrous Egg + [29445] = 71637, -- Mysterious Grimoire + [29446] = 71638, -- Ornate Weapon + [29451] = 71715, -- A Treatise on Strategy + [29456] = 71951, -- Banner of the Fallen + [29457] = 71952, -- Captured Insignia + [29458] = 71953, -- Fallen Adventurer's Journal + [29464] = 71716, -- Soothsayer's Runes + + -- Tiller Gifts + ["progress_79264"] = 79264, -- Ruby Shard + ["progress_79265"] = 79265, -- Blue Feather + ["progress_79266"] = 79266, -- Jade Cat + ["progress_79267"] = 79267, -- Lovely Apple + ["progress_79268"] = 79268, -- Marsh Lily + + -- Garrison scouting missives + ["38180"] = 122424, -- Scouting Missive: Broken Precipice + ["38193"] = 122423, -- Scouting Missive: Broken Precipice + ["38182"] = 122418, -- Scouting Missive: Darktide Roost + ["38196"] = 122417, -- Scouting Missive: Darktide Roost + ["38179"] = 122400, -- Scouting Missive: Everbloom Wilds + ["38192"] = 122404, -- Scouting Missive: Everbloom Wilds + ["38194"] = 122420, -- Scouting Missive: Gorian Proving Grounds + ["38202"] = 122419, -- Scouting Missive: Gorian Proving Grounds + ["38178"] = 122402, -- Scouting Missive: Iron Siegeworks + ["38191"] = 122406, -- Scouting Missive: Iron Siegeworks + ["38184"] = 122413, -- Scouting Missive: Lost Veil Anzu + ["38198"] = 122414, -- Scouting Missive: Lost Veil Anzu + ["38177"] = 122403, -- Scouting Missive: Magnarok + ["38190"] = 122399, -- Scouting Missive: Magnarok + ["38181"] = 122421, -- Scouting Missive: Mok'gol Watchpost + ["38195"] = 122422, -- Scouting Missive: Mok'gol Watchpost + ["38185"] = 122411, -- Scouting Missive: Pillars of Fate + ["38199"] = 122409, -- Scouting Missive: Pillars of Fate + ["38187"] = 122412, -- Scouting Missive: Shattrath Harbor + ["38201"] = 122410, -- Scouting Missive: Shattrath Harbor + ["38186"] = 122408, -- Scouting Missive: Skettis + ["38200"] = 122407, -- Scouting Missive: Skettis + ["38183"] = 122416, -- Scouting Missive: Socrethar's Rise + ["38197"] = 122415, -- Scouting Missive: Socrethar's Rise + ["38176"] = 122405, -- Scouting Missive: Stonefury Cliffs + ["38189"] = 122401, -- Scouting Missive: Stonefury Cliffs + + -- Misc + [31664] = 88604, -- Nat's Fishing Journal }, CashRewards = { - [45724] = 1e5, - [64491] = 2e6, - - [138127] = 15, - [138129] = 11, - [138131] = 24, - [138123] = 15, - [138125] = 16, - [138133] = 27, + [45724] = 1e5, -- Champion's Purse + [64491] = 2e6, -- Royal Reward + + -- Items from the Sixtrigger brothers quest chain in Stormheim + [138127] = 15, -- Mysterious Coin, 15 copper + [138129] = 11, -- Swatch of Priceless Silk, 11 copper + [138131] = 24, -- Magical Sprouting Beans, 24 copper + [138123] = 15, -- Shiny Gold Nugget, 15 copper + [138125] = 16, -- Crystal Clear Gemstone, 16 copper + [138133] = 27, -- Elixir of Endless Wonder, 27 copper }, } diff --git a/KkthnxUI/Config/GUI.lua b/KkthnxUI/Config/GUI.lua index b9706d1e..3c998bef 100644 --- a/KkthnxUI/Config/GUI.lua +++ b/KkthnxUI/Config/GUI.lua @@ -500,7 +500,6 @@ local Automation = function(self) -- Invite Management sub-section Window:CreateSection("Invite Management") - Window:CreateSwitch("Automation", "AutoBlockStrangerInvites", L["Block Invites From Strangers"]) Window:CreateSwitch("Automation", "AutoInvite", L["Accept Invites From Friends & Guild Members"]) Window:CreateSwitch("Automation", "AutoDeclineDuels", L["Decline PvP Duels"]) Window:CreateSwitch("Automation", "AutoDeclinePetDuels", L["Decline Pet Duels"]) @@ -520,12 +519,13 @@ local Automation = function(self) Window:CreateSection("Miscellaneous Options") Window:CreateSwitch("Automation", "AutoCollapse", L["Auto Collapse Objective Tracker"]) Window:CreateSwitch("Automation", "AutoGoodbye", L["Say Goodbye After Dungeon Completion"]) - Window:CreateSwitch("Automation", "AutoOpenItems", L["Auto Open Items In Your Inventory"]) Window:CreateSwitch("Automation", "AutoKeystone", newFeatureIcon .. L["Auto Place Mythic Keystones"]) + Window:CreateSwitch("Automation", "AutoOpenItems", L["Auto Open Items In Your Inventory"]) Window:CreateSwitch("Automation", "AutoRelease", L["Auto Release in Battlegrounds & Arenas"]) Window:CreateSwitch("Automation", "AutoScreenshot", L["Auto Screenshot Achievements"]) Window:CreateSwitch("Automation", "AutoSetRole", L["Auto Set Your Role In Groups"]) Window:CreateSwitch("Automation", "AutoSkipCinematic", L["Auto Skip All Cinematics/Movies"]) + Window:CreateSwitch("Automation", "AutoSummon", L["Auto Accept Summon Requests"]) Window:CreateSwitch("Automation", "NoBadBuffs", L["Automatically Remove Annoying Buffs"]) end @@ -629,7 +629,6 @@ local Chat = function(self) -- Chat appearance Window:CreateSection("Appearance") Window:CreateSwitch("Chat", "Emojis", L["Show Emojis In Chat"] .. emojiExampleIcon) - Window:CreateSwitch("Chat", "RoleIcons", L["Show Role Icons In Chat"]) Window:CreateSwitch("Chat", "ChatItemLevel", L["Show ItemLevel on ChatFrames"]) Window:CreateDropdown("Chat", "TimestampFormat", L["Custom Chat Timestamps"]) @@ -648,28 +647,21 @@ local Chat = function(self) Window:CreateSection(L["Fading"]) Window:CreateSwitch("Chat", "Fading", L["Fade Chat Text"]) Window:CreateSlider("Chat", "FadingTimeVisible", L["Fading Chat Visible Time"], 5, 120, 1) - - Window:CreateSection(FILTERS) - Window:CreateSwitch("Chat", "EnableFilter", enableTextColor .. L["Enable Chat Filter"]) - Window:CreateSwitch("Chat", "BlockSpammer", L["Block Repeated Spammer Messages"]) - Window:CreateSwitch("Chat", "BlockStranger", L["Block Whispers From Strangers"]) - Window:CreateSlider("Chat", "FilterMatches", L["Filter Matches Number"], 1, 3, 1) - Window:CreateEditBox("Chat", "ChatFilterList", L["ChatFilter BlackList"], "Enter words you want blacklisted|n|nUse SPACES between each word|n|nPress enter when you are done", UpdateFilterList) - Window:CreateEditBox("Chat", "ChatFilterWhiteList", L["ChatFilter WhiteList"], "Enter words you want whitelisted|n|nUse SPACES between each word|n|nPress enter when you are done", UpdateFilterWhiteList) end local DataText = function(self) local Window = self:CreateWindow(L["DataText"]) Window:CreateSection(GENERAL) + Window:CreateSwitch("DataText", "Coords", L["Enable Positon Coords"]) Window:CreateSwitch("DataText", "Friends", L["Enable Friends Info"]) Window:CreateSwitch("DataText", "Gold", L["Enable Currency Info"]) Window:CreateSwitch("DataText", "Guild", L["Enable Guild Info"]) Window:CreateSwitch("DataText", "Latency", L["Enable Latency Info"]) Window:CreateSwitch("DataText", "Location", L["Enable Minimap Location"]) + Window:CreateSwitch("DataText", "Spec", "Enable Specialization Info") Window:CreateSwitch("DataText", "System", L["Enable System Info"]) Window:CreateSwitch("DataText", "Time", L["Enable Minimap Time"]) - Window:CreateSwitch("DataText", "Coords", L["Enable Positon Coords"]) -- Section: Icon Colors Window:CreateSection("Icon Colors") @@ -696,6 +688,8 @@ local General = function(self) Window:CreateSwitch("General", "NoTutorialButtons", L["Disable 'Some' Blizzard Tutorials"]) Window:CreateSwitch("General", "VersionCheck", L["Enable Version Checking"]) + Window:CreateDropdown("General", "GlowMode", "Button Glow Mode") + -- Border Style Window:CreateDropdown("General", "BorderStyle", L["Border Style"]) diff --git a/KkthnxUI/Config/Settings.lua b/KkthnxUI/Config/Settings.lua index afcb0807..4f311d47 100644 --- a/KkthnxUI/Config/Settings.lua +++ b/KkthnxUI/Config/Settings.lua @@ -131,7 +131,6 @@ C["Announcements"] = { -- Automation C["Automation"] = { AutoKeystone = false, - AutoBlockStrangerInvites = false, AutoCollapse = false, AutoDeclineDuels = false, AutoDeclinePetDuels = false, @@ -150,7 +149,7 @@ C["Automation"] = { AutoSummon = false, NoBadBuffs = false, WhisperInvite = "inv+", - WhisperInviteGuildFriends = false, + WhisperInviteRestriction = true, -- Testing } C["Inventory"] = { @@ -230,25 +229,18 @@ C["Auras"] = { -- Chat C["Chat"] = { - BlockSpammer = true, Background = true, - BlockStranger = false, - ChatFilterList = "%*", - ChatFilterWhiteList = "", ChatItemLevel = true, ChatMenu = true, Emojis = false, Enable = true, - EnableFilter = true, Fading = true, FadingTimeVisible = 100, - FilterMatches = 1, Freedom = true, Height = 170, Lock = true, LogMax = 0, OldChatNames = false, - RoleIcons = false, Sticky = false, WhisperColor = true, Width = 400, @@ -276,6 +268,7 @@ C["DataText"] = { IconColor = { 102 / 255, 157 / 255, 255 / 255 }, Latency = true, Location = true, + Spec = false, System = true, Time = true, } @@ -324,6 +317,15 @@ C["General"] = { Profiles = { Options = {}, }, + GlowMode = { + Options = { + ["Pixel"] = 1, + ["Autocast"] = 2, + ["Action Button"] = 3, + ["Proc Glow"] = 4, + }, + Value = 3, + }, } -- Loot @@ -406,6 +408,7 @@ C["Misc"] = { ShowWowHeadLinks = false, SlotDurability = false, TradeTabs = false, + EasyMarking = false, EasyMarkKey = { Options = { ["CTRL"] = 1, @@ -454,7 +457,7 @@ C["Nameplate"] = { InsecureColor = { 1, 0, 0 }, InsideView = true, MaxAuras = 5, - MinAlpha = 1, + MinAlpha = 0.6, MinScale = 1, CVarOnlyNames = false, CVarShowNPCs = false, diff --git a/KkthnxUI/Core/AddOns.lua b/KkthnxUI/Core/AddOns.lua index fe78e134..3e19fbb7 100644 --- a/KkthnxUI/Core/AddOns.lua +++ b/KkthnxUI/Core/AddOns.lua @@ -266,6 +266,8 @@ local function ForceCursorTrail() return end + print(C_AddOns.IsAddOnLoaded("CursorTrail")) + if CursorTrail_PlayerConfig then table_wipe(CursorTrail_PlayerConfig) end diff --git a/KkthnxUI/Core/CheckVersion.lua b/KkthnxUI/Core/CheckVersion.lua index eef0207b..270783b5 100644 --- a/KkthnxUI/Core/CheckVersion.lua +++ b/KkthnxUI/Core/CheckVersion.lua @@ -16,28 +16,24 @@ local GetTime = GetTime local IsInGroup = IsInGroup local IsInGuild = IsInGuild -local lastVCTime = 0 -local isVCInit -local UIUpdateNotice - -local function HandleVersionTag(version) - local major, minor = string_split(".", version) - major, minor = tonumber(major), tonumber(minor) +local lastVCTime, isVCInit = 0 +local tn = tonumber +local function HandleVersonTag(version) + local major, minor = strsplit(".", version) + major, minor = tn(major), tn(minor) if K.LibBase64:CV(major) then major, minor = 0, 0 - if K.isDeveloper and author then print("Moron: " .. author) end end - return major, minor end function Module:VersionCheck_Compare(new, old, author) - local new1, new2 = HandleVersionTag(new, author) - local old1, old2 = HandleVersionTag(old) + local new1, new2 = HandleVersonTag(new, author) + local old1, old2 = HandleVersonTag(old) if new1 > old1 or (new1 == old1 and new2 > old2) then return "IsNew" elseif new1 < old1 or (new1 == old1 and new2 < old2) then @@ -45,70 +41,79 @@ function Module:VersionCheck_Compare(new, old, author) end end +function Module:CreateUpdateNoticeFrame() + local frame = CreateFrame("Frame", "KKUI_UpdateNotice", UIParent) + frame:SetSize(420, 150) + frame:SetPoint("CENTER", UIParent, "CENTER") + frame:CreateBorder() + + frame.Texture = frame:CreateTexture(nil, "OVERLAY") + frame.Texture:SetTexture("Interface\\HELPFRAME\\HelpIcon-ReportAbuse") + frame.Texture:SetPoint("TOP", frame, "TOP", 0, 8) + + frame.Text = frame:CreateFontString(nil, "OVERLAY") + frame.Text:SetWidth(400) + frame.Text:SetFontObject(K.UIFont) + frame.Text:SetFont(select(1, frame.Text:GetFont()), 15, select(3, frame.Text:GetFont())) + frame.Text:SetPoint("CENTER", frame, "CENTER") + + frame.EditBox = CreateFrame("EditBox", nil, frame) + frame.EditBox:SetPoint("BOTTOM", frame, "BOTTOM", 0, 8) + frame.EditBox:SetWidth(330) + frame.EditBox:SetHeight(19) + frame.EditBox:SetMultiLine(false) + frame.EditBox:SetAutoFocus(false) + frame.EditBox:SetFontObject(K.UIFont) + frame.EditBox:CreateBorder() + + frame.EditBox.Text = frame.EditBox:CreateFontString(nil, "OVERLAY") + frame.EditBox.Text:SetFontObject(K.UIFont) + frame.EditBox.Text:SetPoint("BOTTOM", frame.EditBox, "TOP", 0, 2) + + frame.OkayButton = CreateFrame("Button", nil, frame) + frame.OkayButton:SetPoint("TOP", frame, "BOTTOM", 0, -6) + frame.OkayButton:SetSize(420, 24) + frame.OkayButton:SkinButton() + frame.OkayButton:SetScript("OnClick", function() + if frame:IsShown() then + frame:Hide() + end + end) + + frame.OkayButton.Text = frame.OkayButton:CreateFontString(nil, "ARTWORK") + frame.OkayButton.Text:SetFontObject(K.UIFont) + frame.OkayButton.Text:SetFont(select(1, frame.OkayButton.Text:GetFont()), 13, select(3, frame.OkayButton.Text:GetFont())) + frame.OkayButton.Text:SetText("I am going to update right now") + frame.OkayButton.Text:SetTextColor(0, 1, 0) + frame.OkayButton.Text:SetPoint("CENTER", frame.OkayButton, "CENTER", 0, 0) + K.AddTooltip(frame.OkayButton, "ANCHOR_BOTTOM", K.SystemColor .. "Obviously |cff669dffKkthnx|r is trusting you to go update and not complain about a missing feature or a bug because you are out of date |CFFFF0000<3|r") + + return frame +end + function Module:VersionCheck_Create(text) if not C["General"].VersionCheck then return end - UIUpdateNotice = CreateFrame("Frame", "KKUI_UpdateNotice", UIParent) - UIUpdateNotice:SetSize(420, 150) - UIUpdateNotice:SetPoint("CENTER", UIParent, "CENTER") - UIUpdateNotice:CreateBorder() - - UIUpdateNotice.Texture = UIUpdateNotice:CreateTexture(nil, "OVERLAY") - UIUpdateNotice.Texture:SetTexture("Interface\\HELPFRAME\\HelpIcon-ReportAbuse") - UIUpdateNotice.Texture:SetPoint("TOP", UIUpdateNotice, "TOP", 0, 8) - - UIUpdateNotice.Text = UIUpdateNotice:CreateFontString(nil, "OVERLAY") - UIUpdateNotice.Text:SetWidth(400) - UIUpdateNotice.Text:SetFontObject(K.UIFont) - UIUpdateNotice.Text:SetText(text) - UIUpdateNotice.Text:SetFont(select(1, UIUpdateNotice.Text:GetFont()), 15, select(3, UIUpdateNotice.Text:GetFont())) - UIUpdateNotice.Text:SetPoint("CENTER", UIUpdateNotice, "CENTER") - - UIUpdateNotice.EditBox = CreateFrame("EditBox", nil, UIUpdateNotice) - UIUpdateNotice.EditBox:SetPoint("BOTTOM", UIUpdateNotice, "BOTTOM", 0, 8) - UIUpdateNotice.EditBox:SetText("https://www.curseforge.com/wow/addons/kkthnxui") - UIUpdateNotice.EditBox:SetWidth(330) - UIUpdateNotice.EditBox:SetHeight(19) - UIUpdateNotice.EditBox:SetMultiLine(false) - UIUpdateNotice.EditBox:SetAutoFocus(false) - UIUpdateNotice.EditBox:SetFontObject(K.UIFont) - UIUpdateNotice.EditBox:CreateBorder() - - UIUpdateNotice.EditBox.Text = UIUpdateNotice.EditBox:CreateFontString(nil, "OVERLAY") - UIUpdateNotice.EditBox.Text:SetFontObject(K.UIFont) - UIUpdateNotice.EditBox.Text:SetText(K.SystemColor .. "Download Latest Release|r") - UIUpdateNotice.EditBox.Text:SetPoint("BOTTOM", UIUpdateNotice.EditBox, "TOP", 0, 2) - - UIUpdateNotice.OkayButton = CreateFrame("Button", nil, UIUpdateNotice) - UIUpdateNotice.OkayButton:SetPoint("TOP", UIUpdateNotice, "BOTTOM", 0, -6) - UIUpdateNotice.OkayButton:RegisterForClicks("AnyUp") - UIUpdateNotice.OkayButton:SetSize(420, 24) - UIUpdateNotice.OkayButton:SkinButton() - UIUpdateNotice.OkayButton:SetScript("OnClick", function() - if UIUpdateNotice:IsShown() then - UIUpdateNotice:Hide() - end - end) - - UIUpdateNotice.OkayButton.Text = UIUpdateNotice.OkayButton:CreateFontString(nil, "ARTWORK") - UIUpdateNotice.OkayButton.Text:SetFontObject(K.UIFont) - UIUpdateNotice.OkayButton.Text:SetFont(select(1, UIUpdateNotice.OkayButton.Text:GetFont()), 13, select(3, UIUpdateNotice.OkayButton.Text:GetFont())) - UIUpdateNotice.OkayButton.Text:SetText("I am going to update right now") - UIUpdateNotice.OkayButton.Text:SetTextColor(0, 1, 0) - UIUpdateNotice.OkayButton.Text:SetPoint("CENTER", UIUpdateNotice.OkayButton, "CENTER", 0, 0) - K.AddTooltip(UIUpdateNotice.OkayButton, "ANCHOR_BOTTOM", K.SystemColor .. "Obviously |cff669dffKkthnx|r is trusting you to go update and not complain about a missing feature or a bug because you are out of date |CFFFF0000<3|r") + -- HelpTip:Show(ChatFrame1, { + -- text = text, + -- buttonStyle = HelpTip.ButtonStyle.Okay, + -- targetPoint = HelpTip.Point.TopEdgeCenter, + -- offsetY = 10, + -- }) - return UIUpdateNotice + local frame = Module:CreateUpdateNoticeFrame() + frame.Text:SetText(text) + frame:Show() end function Module:VersionCheck_Init() if not isVCInit then local status = Module:VersionCheck_Compare(KkthnxUIDB.DetectVersion, K.Version) if status == "IsNew" then - local release = string_gsub(KkthnxUIDB.DetectVersion, "(%d+)$", "0") - Module:VersionCheck_Create(string_format("|cff669dffKkthnxUI|r is out of date, the latest release is |cff70C0F5%s|r", release)) + local release = gsub(KkthnxUIDB.DetectVersion, "(%d+)$", "0") + Module:VersionCheck_Create(format("|cff669dffKkthnxUI|r is out of date, the latest release is |cff70C0F5%s|r", release)) elseif status == "IsOld" then KkthnxUIDB.DetectVersion = K.Version end @@ -129,7 +134,6 @@ function Module:VersionCheck_Update(...) if prefix ~= "KKUIVersionCheck" then return end - if Ambiguate(author, "none") == K.Name then return end @@ -146,16 +150,9 @@ end function Module:VersionCheck_UpdateGroup() if not IsInGroup() then - --print("Not in a group") return end - - -- Check if the player has changed groups - if not Module.lastGroup or Module.lastGroup ~= K.CheckChat() then - Module.lastGroup = K.CheckChat() - Module:VersionCheck_Send(Module.lastGroup) - -- print("Sent version check to group: " .. Module.lastGroup) - end + Module:VersionCheck_Send(IsPartyLFG() and "INSTANCE_CHAT" or IsInRaid() and "RAID" or "PARTY") end function Module:OnEnable() @@ -170,12 +167,3 @@ function Module:OnEnable() Module:VersionCheck_UpdateGroup() K:RegisterEvent("GROUP_ROSTER_UPDATE", Module.VersionCheck_UpdateGroup) end - --- Register a slash command -SLASH_KKUIVERSIONCHECK1 = "/kkvc" - --- Slash command handler -SlashCmdList["KKUIVERSIONCHECK"] = function(msg) - print("Version check command triggered") - Module:VersionCheck_Init() -end diff --git a/KkthnxUI/Core/Colors.lua b/KkthnxUI/Core/Colors.lua index 952de5b3..47868db6 100644 --- a/KkthnxUI/Core/Colors.lua +++ b/KkthnxUI/Core/Colors.lua @@ -45,18 +45,16 @@ oUF.colors.reaction = { } oUF.colors.selection = { - [0] = { 0.87, 0.37, 0.37 }, -- HOSTILE - [1] = { 0.87, 0.37, 0.37 }, -- UNFRIENDLY - [2] = { 0.85, 0.77, 0.36 }, -- NEUTRAL - [3] = { 0.29, 0.67, 0.30 }, -- FRIENDLY - [4] = { 0, 0, 1 }, -- PLAYER_SIMPLE - [5] = { 0, 0, 1 }, -- PLAYER_EXTENDED - [6] = { 0, 0, 1 }, -- PARTY - [7] = { 0, 0, 1 }, -- PARTY_PVP - [8] = { 0, 0, 1 }, -- FRIEND - [9] = { 0.5, 0.5, 0.5 }, -- DEAD - [12] = { 1, 1, 0.55 }, -- SELF, buggy - [13] = { 0, 0.6, 0 }, -- BATTLEGROUND_FRIENDLY_PVP + [0] = { 1.00, 0.18, 0.18 }, -- HOSTILE + [1] = { 1.00, 0.51, 0.20 }, -- UNFRIENDLY + [2] = { 1.00, 0.85, 0.20 }, -- NEUTRAL + [3] = { 0.20, 0.71, 0.00 }, -- FRIENDLY + [5] = { 0.40, 0.53, 1.00 }, -- PLAYER_EXTENDED + [6] = { 0.40, 0.20, 1.00 }, -- PARTY + [7] = { 0.73, 0.20, 1.00 }, -- PARTY_PVP + [8] = { 0.20, 1.00, 0.42 }, -- FRIEND + [9] = { 0.60, 0.60, 0.60 }, -- DEAD + [13] = { 0.10, 0.58, 0.28 }, -- BATTLEGROUND_FRIENDLY_PVP } oUF.colors.power = { diff --git a/KkthnxUI/Core/Commands.lua b/KkthnxUI/Core/Commands.lua index 6ae367aa..814c034d 100644 --- a/KkthnxUI/Core/Commands.lua +++ b/KkthnxUI/Core/Commands.lua @@ -94,11 +94,15 @@ local function CheckQuestStatus(questid) end if C_QuestLog_IsQuestFlaggedCompleted(questid) == true then - UIErrorsFrame:AddMessage(QuestCheckComplete .. "Quest " .. "|CFFFFFF00[" .. questid .. "]|r" .. L["CheckQuestComplete"]) + UIErrorsFrame:AddMessage( + QuestCheckComplete .. "Quest " .. "|CFFFFFF00[" .. questid .. "]|r" .. L["CheckQuestComplete"] + ) PlaySound("878") K.Print(WoWHeadLoc .. questid) else - UIErrorsFrame:AddMessage(QuestCheckIncomplete .. "Quest " .. "|CFFFFFF00[" .. questid .. "]|r" .. L["CheckQuestNotComplete"]) + UIErrorsFrame:AddMessage( + QuestCheckIncomplete .. "Quest " .. "|CFFFFFF00[" .. questid .. "]|r" .. L["CheckQuestNotComplete"] + ) PlaySound("847") K.Print(WoWHeadLoc .. questid) end @@ -202,7 +206,10 @@ local function StoreAndDisableAddons() end StaticPopupDialogs["CONFIRM_DISABLE_ADDONS"] = { - text = string.format("Are you sure you want to disable |cff669DFF%d|r addon(s) except |cff669DFFKkthnxUI|r for debugging?|n|nYou can use '|cff669DFFkkdebug off|r' to restore them.", addonsToDisable), + text = string.format( + "Are you sure you want to disable |cff669DFF%d|r addon(s) except |cff669DFFKkthnxUI|r for debugging?|n|nYou can use '|cff669DFFkkdebug off|r' to restore them.", + addonsToDisable + ), button1 = "Yes", button2 = "No", OnAccept = function() diff --git a/KkthnxUI/Core/Functions.lua b/KkthnxUI/Core/Functions.lua index e2cd5308..09cb0d85 100644 --- a/KkthnxUI/Core/Functions.lua +++ b/KkthnxUI/Core/Functions.lua @@ -90,54 +90,40 @@ do end end + -- Function to get the class icon using atlas textures function K.GetClassIcon(class, iconSize) local size = iconSize or 16 - if class then - local L, R, T, B = unpack(CLASS_ICON_TCOORDS[class]) - if L then - local imageSize = 128 - return "|TInterface\\AddOns\\KkthnxUI\\Media\\Unitframes\\NEW-ICONS-CLASSES:" .. size .. ":" .. size .. ":0:0:" .. imageSize .. ":" .. imageSize .. ":" .. (L * imageSize) .. ":" .. (R * imageSize) .. ":" .. (T * imageSize) .. ":" .. (B * imageSize) .. "|t" - end - end - end + return string.format("|A:groupfinder-icon-class-%s:%d:%d|a ", string.lower(class), size, size) + end + end + + -- Table for class colors + local ClassColors = { + DEATHKNIGHT = "|CFFC41F3B", + DEMONHUNTER = "|CFFA330C9", + DRUID = "|CFFFF7D0A", + EVOKER = "|CFF33937F", + HUNTER = "|CFFA9D271", + MAGE = "|CFF40C7EB", + MONK = "|CFF00FF96", + PALADIN = "|CFFF58CBA", + PRIEST = "|CFFFFFFFF", + ROGUE = "|CFFFFF569", + SHAMAN = "|CFF0070DE", + WARLOCK = "|CFF8787ED", + WARRIOR = "|CFFC79C6E", + } + -- Function to get the class color function K.GetClassColor(class) - if class then - if class == "DEATHKNIGHT" then - return "|CFFC41F3B" - elseif class == "DEMONHUNTER" then - return "|CFFA330C9" - elseif class == "DRUID" then - return "|CFFFF7D0A" - elseif class == "EVOKER" then - return "|CFF33937F" - elseif class == "HUNTER" then - return "|CFFA9D271" - elseif class == "MAGE" then - return "|CFF40C7EB" - elseif class == "MONK" then - return "|CFF00FF96" - elseif class == "PALADIN" then - return "|CFFF58CBA" - elseif class == "PRIEST" then - return "|CFFFFFFFF" - elseif class == "ROGUE" then - return "|CFFFFF569" - elseif class == "SHAMAN" then - return "|CFF0070DE" - elseif class == "WARLOCK" then - return "|CFF8787ED" - elseif class == "WARRIOR" then - return "|CFFC79C6E" - end - end + return ClassColors[class] end - function K.GetClassIconAndColor(class, textColor, iconSize) + -- Function to get the class icon and color + function K.GetClassIconAndColor(class, iconSize) local classIcon = K.GetClassIcon(class, iconSize) local classColor = K.GetClassColor(class) - return classIcon .. classColor end @@ -264,41 +250,31 @@ end -- Class Color and Unit Color Functions do function K.ColorClass(class) - -- check if the class color exists in the class color table local color = K.ClassColors[class] - -- if the class color does not exist, return white if not color then return 1, 1, 1 end - -- return the red, green, and blue values of the class color return color.r, color.g, color.b end function K.UnitColor(unit) - -- set the default color to white local r, g, b = 1, 1, 1 - -- check if the unit is a player + if UnitIsPlayer(unit) then local class = select(2, UnitClass(unit)) - -- check if class exists, and get the color of the class if class then r, g, b = K.ColorClass(class) end - -- check if the unit's tap is denied elseif UnitIsTapDenied(unit) then r, g, b = 0.6, 0.6, 0.6 else - -- get the reaction of the unit to the player local reaction = UnitReaction(unit, "player") - -- check if reaction exists, and get the color of the reaction if reaction then - local color = K.Colors.reaction[reaction] or FACTION_BAR_COLORS[reaction] - r = color.r or color[1] or 1 - g = color.g or color[2] or 1 - b = color.b or color[3] or 1 + local color = K.Colors.reaction[reaction] + r, g, b = color[1], color[2], color[3] end end - -- return the red, green, and blue values of the color + return r, g, b end end @@ -463,6 +439,19 @@ do K:RegisterEvent("PLAYER_TALENT_UPDATE", CheckRole) K:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED", CheckRole) + -- Role Icons + local GroupRoleTex = { + TANK = "roleicon-tiny-tank", + HEALER = "roleicon-tiny-healer", + DAMAGER = "roleicon-tiny-dps", + DPS = "roleicon-tiny-dps", + } + + function K.ReskinSmallRole(self, role) + self:SetTexCoord(0, 1, 0, 1) + self:SetAtlas(GroupRoleTex[role]) + end + function K.CheckChat() return IsPartyLFG() and "INSTANCE_CHAT" or IsInRaid() and "RAID" or "PARTY" end @@ -542,47 +531,13 @@ end -- Overlay Glow Functions do - function K.CreateGlowFrame(self, size, splus) - splus = splus or 8 -- set the additional size to 8 if not specified + function K.CreateGlowFrame(self, size) local glowFrame = CreateFrame("Frame", nil, self) glowFrame:SetPoint("CENTER") - glowFrame:SetSize(size + splus, size + splus) + glowFrame:SetSize(size + 8, size + 8) return glowFrame end - - function K.ShowOverlayGlow(self, template, ...) - local args = { ... } - template = template or "ButtonGlow" -- set the default template to ButtonGlow - - if not K.LibCustomGlow then - return - end - - if template == "ButtonGlow" then - K.LibCustomGlow.ButtonGlow_Start(self, unpack(args)) - elseif template == "AutoCastGlow" then - K.LibCustomGlow.AutoCastGlow_Start(self, unpack(args)) - elseif template == "PixelGlow" then - K.LibCustomGlow.PixelGlow_Start(self, unpack(args)) - end - end - - function K.HideOverlayGlow(self, template) - template = template or "ButtonGlow" -- set the default template to ButtonGlow - - if not K.LibCustomGlow then - return - end - - if template == "ButtonGlow" then - K.LibCustomGlow.ButtonGlow_Stop(self) - elseif template == "AutoCastGlow" then - K.LibCustomGlow.AutoCastGlow_Stop(self) - elseif template == "PixelGlow" then - K.LibCustomGlow.PixelGlow_Stop(self) - end - end end -- Movable Frame and String Shortening Functions diff --git a/KkthnxUI/Core/GUI.lua b/KkthnxUI/Core/GUI.lua index 6cf24043..7a5311cc 100644 --- a/KkthnxUI/Core/GUI.lua +++ b/KkthnxUI/Core/GUI.lua @@ -57,49 +57,57 @@ local LastActiveDropdown local LastActiveWindow local MySelectedProfile = K.Realm .. "-" .. K.Name -local CreditLines = { - { type = "header", text = "PATREONS", color = "C0C0C0" }, - { type = "header", text = "" }, - { type = "header", text = "Tier 1" }, - { type = "header", text = "Tier 2" }, - { type = "header", text = "Tier 3" }, - { type = "name", text = "Shovil", class = "WARRIOR" }, - { type = "header", text = "Tier 4" }, - { type = "header", text = "" }, - { type = "header", text = "CREDITS" }, - { type = "header", text = "" }, - { type = "name", text = "Aftermathh" }, - { type = "name", text = "Alteredcross", class = "ROGUE" }, - { type = "name", text = "Alza" }, - { type = "name", text = "Azilroka", class = "SHAMAN" }, - { type = "name", text = "Benik", color = "00c0fa" }, - { type = "name", text = "Blazeflack" }, - { type = "name", text = "Caellian" }, - { type = "name", text = "Caith" }, - { type = "name", text = "Cassamarra", class = "HUNTER" }, - { type = "name", text = "Darth Predator" }, - { type = "name", text = "Elv", addOn = "(|cff1784d1ElvUI|r)" }, - { type = "name", text = K.GetClassIcon("PRIEST") .. "|cffe31c73Faffi|r|cfffc4796GS|r", class = "PRIEST", color = "e31c73" }, - { type = "name", text = K.GetClassIcon("DRUID") .. "Goldpaw", class = "DRUID", addOn = "(|c00000002|r|cff7284abA|r|cff6a7a9ez|r|cff617092e|r|cff596785r|r|cff505d78i|r|cff48536bt|r|cff3f495fe|r|cffffffffUI|r)" }, - { type = "name", text = "Haleth" }, - { type = "name", text = "Haste" }, - { type = "name", text = "Hungtar" }, - { type = "name", text = "Hydra", addOn = "(|cFFFFC44DvUI|r)" }, - { type = "name", text = "Ishtara" }, - { type = "name", text = "KkthnxUI Community" }, - { type = "name", text = "LightSpark" }, - { type = "name", text = "Magicnachos", class = "PRIEST" }, - { type = "name", text = "Merathilis", class = "DRUID" }, - { type = "name", text = "Nightcracker" }, - { type = "name", text = "P3lim" }, - { type = "name", text = "Palooza", class = "PRIEST" }, - { type = "name", text = "Rav99", class = "DEMONHUNTER" }, - { type = "name", text = "Roth" }, - { type = "name", text = "Shestak", addOn = "ShestakUI" }, - { type = "name", text = "Simpy" }, - { type = "name", text = "siweia", addOn = "NDui" }, +local headers = { + "CREDITS", + "", } +local names = { + { text = "Aftermathh" }, + { text = "Alteredcross", class = "ROGUE" }, + { text = "Alza" }, + { text = "Azilroka", class = "SHAMAN" }, + { text = "Benik", color = "00c0fa" }, + { text = "Blazeflack" }, + { text = "Caellian" }, + { text = "Caith" }, + { text = "Cassamarra", class = "HUNTER" }, + { text = "Darth Predator" }, + { text = "Elv" }, + { text = "|cffe31c73Faffi|r|cfffc4796GS|r", class = "PRIEST" }, + { text = "Goldpaw", class = "DRUID" }, + { text = "Haleth" }, + { text = "Haste" }, + { text = "Hungtar" }, + { text = "Hydra" }, + { text = "Ishtara" }, + { text = "KkthnxUI Community" }, + { text = "LightSpark" }, + { text = "Magicnachos", class = "PRIEST" }, + { text = "Merathilis", class = "DRUID" }, + { text = "Nightcracker" }, + { text = "P3lim" }, + { text = "Palooza", class = "PRIEST" }, + { text = "Rav99", class = "DEMONHUNTER" }, + { text = "Roth" }, + { text = "Shestak" }, + { text = "Simpy" }, + { text = "siweia" }, +} + +local function createCreditLines(headers, names) + local lines = {} + for _, text in ipairs(headers) do + table.insert(lines, { type = "header", text = text }) + end + for _, name in ipairs(names) do + table.insert(lines, { type = "name", text = name.text, class = name.class, color = name.color }) + end + return lines +end + +local CreditLines = createCreditLines(headers, names) + local GUI = CreateFrame("Frame", "KKUI_GUI", UIParent) GUI.Windows = {} GUI.Buttons = {} @@ -1235,8 +1243,7 @@ local ColorOnMouseUp = function(self, button) HideUIPanel(CPF) CPF.Button = self - CPF.Content.ColorPicker:SetColorRGB(CurrentR, CurrentG, CurrentB) - CPF.swatchFunc = function() end + CPF:SetColorRGB(CurrentR, CurrentG, CurrentB) CPF.Group = self.Group CPF.Option = self.Option @@ -1638,8 +1645,7 @@ local CreditLineHeight = 20 local function SetUpCredits(frame) frame.Lines = {} - for i = 1, #CreditLines do - local entry = CreditLines[i] + for i, entry in ipairs(CreditLines) do local Line = CreateFrame("Frame", nil, frame) Line:SetSize(frame:GetWidth(), CreditLineHeight) @@ -1656,13 +1662,13 @@ local function SetUpCredits(frame) end elseif entry.type == "name" then if entry.class then - Line.Text:SetTextColor(K.ClassColors[entry.class].r, K.ClassColors[entry.class].g, K.ClassColors[entry.class].b) + local classIconAndColor = K.GetClassIconAndColor(entry.class, 14) + Line.Text:SetText(classIconAndColor .. entry.text) elseif entry.color then Line.Text:SetTextColor(tonumber(entry.color:sub(1, 2), 16) / 255, tonumber(entry.color:sub(3, 4), 16) / 255, tonumber(entry.color:sub(5, 6), 16) / 255) - end - Line.Text:SetText(entry.text) - if entry.addOn then - Line.Text:SetText(Line.Text:GetText() .. " - " .. entry.addOn) + Line.Text:SetText(entry.text) + else + Line.Text:SetText(entry.text) end end @@ -1672,7 +1678,7 @@ local function SetUpCredits(frame) Line:SetPoint("TOP", frame.Lines[i - 1], "BOTTOM", 0, 0) end - tinsert(frame.Lines, Line) + table.insert(frame.Lines, Line) end frame:SetHeight(#frame.Lines * CreditLineHeight) diff --git a/KkthnxUI/Core/Install.lua b/KkthnxUI/Core/Install.lua index b07e1536..18cdefa8 100644 --- a/KkthnxUI/Core/Install.lua +++ b/KkthnxUI/Core/Install.lua @@ -233,63 +233,14 @@ function Module:ForceChatSettings() resetAndConfigureChatFrames() -- Configure specific chat frames - configureChatFrame(ChatFrame1, L["General"], { TRADE, L["Services"], GENERAL, "GuildRecruitment", "LookingForGroup" }, { - "ACHIEVEMENT", - "AFK", - "BG_ALLIANCE", - "BG_HORDE", - "BG_NEUTRAL", - "BN_INLINE_TOAST_ALERT", - "CHANNEL", - "DND", - "EMOTE", - "ERRORS", - "GUILD", - "GUILD_ACHIEVEMENT", - "IGNORED", - "INSTANCE_CHAT", - "INSTANCE_CHAT_LEADER", - "MONSTER_BOSS_EMOTE", - "MONSTER_BOSS_WHISPER", - "MONSTER_EMOTE", - "MONSTER_SAY", - "MONSTER_WHISPER", - "MONSTER_YELL", - "OFFICER", - "PARTY", - "PARTY_LEADER", - "RAID", - "RAID_LEADER", - "RAID_WARNING", - "SAY", - "SYSTEM", - "YELL", - }) + configureChatFrame(ChatFrame1, L["General"], { TRADE, L["Services"], GENERAL, "GuildRecruitment", "LookingForGroup" }, { "ACHIEVEMENT", "AFK", "BG_ALLIANCE", "BG_HORDE", "BG_NEUTRAL", "BN_INLINE_TOAST_ALERT", "CHANNEL", "DND", "EMOTE", "ERRORS", "GUILD", "GUILD_ACHIEVEMENT", "IGNORED", "INSTANCE_CHAT", "INSTANCE_CHAT_LEADER", "MONSTER_BOSS_EMOTE", "MONSTER_BOSS_WHISPER", "MONSTER_EMOTE", "MONSTER_SAY", "MONSTER_WHISPER", "MONSTER_YELL", "OFFICER", "PARTY", "PARTY_LEADER", "PING", "RAID", "RAID_LEADER", "RAID_WARNING", "SAY", "SYSTEM", "YELL" }) configureChatFrame(ChatFrame2, L["CombatLog"], nil, {}, true) configureChatFrame(ChatFrame4, L["Whisper"], nil, { "WHISPER", "BN_WHISPER", "BN_CONVERSATION" }, true) configureChatFrame(ChatFrame5, L["Trade"], nil, {}, true) configureChatFrame(ChatFrame6, L["Loot"], nil, { "COMBAT_XP_GAIN", "COMBAT_HONOR_GAIN", "COMBAT_FACTION_CHANGE", "SKILL", "LOOT", "CURRENCY", "MONEY" }, true) configureChatColors() - - local classColorGroups = { - "SAY", - "EMOTE", - "YELL", - "WHISPER", - "PARTY", - "PARTY_LEADER", - "RAID", - "RAID_LEADER", - "RAID_WARNING", - "INSTANCE_CHAT", - "INSTANCE_CHAT_LEADER", - "GUILD", - "OFFICER", - "ACHIEVEMENT", - "GUILD_ACHIEVEMENT", - "COMMUNITIES_CHANNEL", - } + local classColorGroups = { "SAY", "EMOTE", "YELL", "WHISPER", "PARTY", "PARTY_LEADER", "RAID", "RAID_LEADER", "RAID_WARNING", "INSTANCE_CHAT", "INSTANCE_CHAT_LEADER", "GUILD", "OFFICER", "ACHIEVEMENT", "GUILD_ACHIEVEMENT", "COMMUNITIES_CHANNEL" } local maxChatChannels = _G.MAX_WOW_CHAT_CHANNELS or 10 -- Fallback in case the global isn't set for i = 1, maxChatChannels do table.insert(classColorGroups, "CHANNEL" .. i) @@ -298,40 +249,32 @@ function Module:ForceChatSettings() end local function CreateFakeAchievementPopup() - local popup = CreateFrame("Frame", "KkthnxUIFakeAchievement", UIParent, "GlowBoxTemplate") - popup:SetSize(300, 70) -- Size similar to the achievement frame + local popup = CreateFrame("Frame", "KKUI_FakeAchievement", UIParent) + popup:SetSize(310, 70) -- Size similar to the achievement frame popup:SetPoint("TOP", UIParent, "TOP", 0, -150) popup:SetFrameStrata("DIALOG") + popup:CreateBorder() popup:Hide() -- Hide the frame initially - -- Background texture - popup.bg = popup:CreateTexture(nil, "BACKGROUND") - popup.bg:SetTexture("Interface\\AchievementFrame\\UI-Achievement-AchievementBackground") - popup.bg:SetPoint("CENTER") - popup.bg:SetSize(296, 66) - popup.bg:SetTexCoord(0, 1, 0, 0.28125) - -- Achievement icon - popup.icon = popup:CreateTexture(nil, "OVERLAY") - popup.icon:SetSize(44, 44) - popup.icon:SetPoint("LEFT", 8, 0) - popup.icon:SetTexture("Interface\\Icons\\Achievement_General") -- Placeholder texture - - -- Assuming you have already created 'popup.icon' before this - popup.iconFrame = popup:CreateTexture(nil, "OVERLAY", nil, 6) - popup.iconFrame:SetSize(56, 56) -- Adjust the size as needed to fit around the icon - popup.iconFrame:SetPoint("CENTER", popup.icon, "CENTER", 0, 0) - popup.iconFrame:SetTexture("Interface\\AchievementFrame\\UI-Achievement-IconFrame") - popup.iconFrame:SetTexCoord(0, 0.5625, 0, 0.5625) -- Adjust if needed to get the correct part of the texture + popup.icon = popup:CreateTexture(nil, "OVERLAY", nil, 6) + popup.icon:SetSize(50, 50) + popup.icon:SetPoint("LEFT", 10, 0) + popup.icon:SetTexture("Interface\\AddOns\\KkthnxUI\\Media\\KkthnxUI_Spell_Icon") -- Placeholder texture + popup.icon:SetTexCoord(K.TexCoords[1], K.TexCoords[2], K.TexCoords[3], K.TexCoords[4]) + + popup.iconFrame = CreateFrame("Frame", nil, popup) + popup.iconFrame:SetAllPoints(popup.icon) + popup.iconFrame:CreateBorder(nil, nil, nil, nil, nil, nil, "") -- Title popup.title = popup:CreateFontString(nil, "OVERLAY", "GameFontNormal") - popup.title:SetPoint("TOP", popup.bg, "TOP", 0, 18) + popup.title:SetPoint("TOP", popup, "TOP", 0, 18) -- Description popup.description = popup:CreateFontString(nil, "OVERLAY", "GameFontHighlight") - popup.description:SetPoint("LEFT", popup.icon, "RIGHT", 8, 0) -- 8 is the padding from the icon, adjust as needed - popup.description:SetPoint("RIGHT", popup.bg, "RIGHT", -8, 0) -- -8 is the padding from the right edge, adjust as needed + popup.description:SetPoint("LEFT", popup.icon, "RIGHT", 14, 0) -- 8 is the padding from the icon, adjust as needed + popup.description:SetPoint("RIGHT", popup, "RIGHT", -8, 0) -- -8 is the padding from the right edge, adjust as needed popup.description:SetJustifyH("LEFT") -- Align text to the left popup.description:SetWordWrap(true) -- Enable word wrapping @@ -449,13 +392,7 @@ local function YesTutor() apply.text:SetText(APPLY) apply.text:SetTextColor(0, 1, 0) - local titles = { - DEFAULT .. " " .. SETTINGS, - CHAT, - UI_SCALE, - "Skins", - "Tips", - } + local titles = { DEFAULT .. " " .. SETTINGS, CHAT, UI_SCALE, "Skins", "Tips" } local function RefreshText(page) title:SetText(titles[page]) @@ -632,17 +569,12 @@ local function HelloWorld() goTutor:SetSize(110, 22) goTutor:SkinButton() - if welcome:IsShown() then - K.ShowOverlayGlow(goTutor, "AutoCastGlow") - end - goTutor.text = goTutor:CreateFontString(nil, "OVERLAY") goTutor.text:SetFontObject(K.UIFont) goTutor.text:SetPoint("CENTER", 0, -1) goTutor.text:SetText(K.MyClassColor .. START .. "|r") goTutor:SetScript("OnClick", function() - K.HideOverlayGlow(goTutor, "AutoCastGlow") welcome:Hide() YesTutor() end) diff --git a/KkthnxUI/Core/Load_Core.xml b/KkthnxUI/Core/Load_Core.xml index f5927240..08dd74c5 100644 --- a/KkthnxUI/Core/Load_Core.xml +++ b/KkthnxUI/Core/Load_Core.xml @@ -15,5 +15,4 @@ \ No newline at end of file