Skip to content

Commit

Permalink
Various updates and fixes. Release soon!
Browse files Browse the repository at this point in the history
  • Loading branch information
Kkthnx committed Nov 16, 2024
1 parent 897ace3 commit d36fc7b
Show file tree
Hide file tree
Showing 25 changed files with 735 additions and 650 deletions.
13 changes: 12 additions & 1 deletion KkthnxUI/Config/Elements/AuraWatchList/All.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ local list = {
{ AuraID = 371024, UnitID = "player" }, -- 元素强能药水
{ AuraID = 371028, UnitID = "player" }, -- 究极元素强能药水
-- 11.0 饰品
{ AuraID = 92099, UnitID = "player" }, -- 灰鳞的优雅
{ AuraID = 268769, UnitID = "player" }, -- 望远镜饰品
{ AuraID = 443531, UnitID = "player" }, -- 振奋之光
{ AuraID = 435493, UnitID = "player" }, -- 死亡之吻
{ AuraID = 455451, UnitID = "player" }, -- 迅芯烛台
{ AuraID = 449954, UnitID = "player" }, -- 奸邪发射机
{ AuraID = 449947, UnitID = "player", Text = NPE_JUMP }, -- 奸邪发射机,跳3下
-- 10.0 饰品
{ AuraID = 381476, UnitID = "player" }, -- 爆发烈焰
{ AuraID = 383941, UnitID = "player" }, -- 崩坏之力
Expand Down Expand Up @@ -230,13 +235,15 @@ local list = {
{ AuraID = 464748, UnitID = "player", Flash = true }, -- 束缚之网,流丝
},
["Warning"] = { -- 目标重要光环组
{ AuraID = 268756, UnitID = "target", Caster = "player" }, -- 望远镜饰品
{ AuraID = 355596, UnitID = "target", Flash = true }, -- 橙弓,哀痛箭
-- 大幻象
{ AuraID = 304975, UnitID = "target", Value = true }, -- 虚空哀嚎,吸收盾
{ AuraID = 319643, UnitID = "target", Value = true }, -- 虚空哀嚎,吸收盾
-- 大米
{ AuraID = 226510, UnitID = "target" }, -- 血池回血
{ AuraID = 343502, UnitID = "target" }, -- 鼓舞光环
{ AuraID = 462704, UnitID = "target" }, -- 碎裂精华,TWW S1
-- 5人
{ AuraID = 372988, UnitID = "target", Value = true }, -- 寒冰壁垒,红玉
{ AuraID = 391050, UnitID = "target", Value = true }, -- 暴风骤雨之盾,红玉
Expand Down Expand Up @@ -284,12 +291,16 @@ local list = {
{ AuraID = 321754, UnitID = "target", Value = true }, -- 通灵战潮,冰缚之盾
{ AuraID = 343470, UnitID = "target", Value = true }, -- 通灵战潮,碎骨之盾
{ AuraID = 328351, UnitID = "target", Flash = true }, -- 通灵战潮,染血长枪
{ AuraID = 273721, UnitID = "target", Flash = true }, -- 围攻,1号易伤
{ AuraID = 423588, UnitID = "target", Value = true }, -- 修道院,圣光屏障
-- S1
{ AuraID = 445409, UnitID = "target", Value = true }, -- 加固壳壁,斯卡莫拉克
-- Raids
{ AuraID = 440177, UnitID = "target", Flash = true }, -- 准备饕餮,噬灭者乌格拉克斯
{ AuraID = 450980, UnitID = "target", Value = true }, -- 存在瓦解,阿努巴拉什
{ AuraID = 451277, UnitID = "target", Value = true }, -- 尖刺风暴,阿努巴拉什
{ AuraID = 440179, UnitID = "target", Value = true }, -- 缠绕,阿努巴拉什
{ AuraID = 456245, UnitID = "target", Value = true }, -- 刺痛谵妄,阿努巴拉什
{ AuraID = 448488, UnitID = "target", Value = true }, -- 崇拜者的保护,尾王
-- PVP
{ AuraID = 498, UnitID = "target" }, -- 圣佑术
Expand Down Expand Up @@ -334,7 +345,7 @@ local list = {
{ AuraID = 228323, UnitID = "target", Value = true }, -- 克罗塔的护盾
},
["InternalCD"] = { -- 自定义内置冷却组
{ IntID = 450978, Duration = 15.4 }, -- 皎月风暴,猎人英雄天赋
{ IntID = 450978, Duration = 13.7 }, -- 皎月风暴,猎人英雄天赋
{ IntID = 114018, Duration = 15, OnSuccess = true, UnitID = "all" }, -- 帷幕
-- {IntID = 240447, Duration = 20}, -- 大米,践踏
-- {IntID = 316958, Duration = 30, OnSuccess = true, UnitID = "all"}, -- 红土
Expand Down
1 change: 1 addition & 0 deletions KkthnxUI/Config/Elements/AuraWatchList/Hunter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ local list = {
{ AuraID = 392956, UnitID = "player" }, -- 巨熊之韧
{ AuraID = 407405, UnitID = "player" }, -- 弦之韵律
{ AuraID = 359844, UnitID = "player" }, -- 荒野的召唤
{ AuraID = 360952, UnitID = "player" }, -- 协同进攻
{ AuraID = 388045, UnitID = "player", Flash = true }, -- 警戒
{ AuraID = 378770, UnitID = "player", Flash = true }, -- 夺命打击
{ AuraID = 378747, UnitID = "player", Flash = true }, -- 凶暴兽群
Expand Down
5 changes: 3 additions & 2 deletions KkthnxUI/Config/Elements/FilterLists/NameplateAuras.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
local C = KkthnxUI[2]

C.NameplateWhiteList = {
[268756] = true, -- 望远镜饰品
-- Buffs
[642] = true, -- Divine Shield
[1022] = true, -- Hand of Protection
Expand Down Expand Up @@ -94,7 +95,7 @@ C.NameplateShowPowerList = {
}

C.NameplateTargetNPCs = {
[165251] = true, -- Sylvan Fox
-- [165251] = true, -- Sylvan Fox
[174773] = true, -- Spiteful Fiend
}

Expand Down Expand Up @@ -188,7 +189,7 @@ C.MajorSpells = {
[381694] = true, -- Decaying Senses, Fernskin
[388060] = true, -- Stinking Breath, Fernskin
[383385] = true, -- Rotting Surge, Fernskin
[382172] = true, -- Necrotic Breath, Fernskin
[382712] = true, -- Necrotic Breath, Fernskin
[384899] = true, -- Bone Arrow Rain, Fernskin
[378282] = true, -- Molten Core, Nassarius
[383651] = true, -- Molten Legion, Nassarius
Expand Down
1 change: 0 additions & 1 deletion KkthnxUI/Config/GUI.lua
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,6 @@ local Misc = function(self)
end
Window:CreateSwitch("Misc", "QuickJoin", newFeatureIcon .. L["QuickJoin"], L["QuickJoinTip"])
Window:CreateSwitch("Misc", "ItemLevel", L["Show Character/Inspect ItemLevel Info"])
Window:CreateSwitch("Misc", "DeathCounter", "Track and display the total deaths and level-specific deaths")
end

local Nameplate = function(self)
Expand Down
1 change: 0 additions & 1 deletion KkthnxUI/Config/Settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,6 @@ C["Misc"] = {
MaxCameraZoom = 2.6,
MuteSounds = true,
NoTalkingHead = false,
DeathCounter = true,
ParagonEnable = false,
QuestTool = false,
QueueTimers = false,
Expand Down
3 changes: 1 addition & 2 deletions KkthnxUI/Core/GUI.lua
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ local SwitchOnLeave = function(self)
end

local CreateSwitch = function(self, group, option, text, tooltip, hook)
-- print("group:", group, "option:", option)
local Value = C[group][option]

local Anchor = CreateFrame("Frame", nil, self)
Expand Down Expand Up @@ -440,7 +439,7 @@ local CreateSwitch = function(self, group, option, text, tooltip, hook)

Switch.Label = Switch:CreateFontString(nil, "OVERLAY")
Switch.Label:SetPoint("LEFT", Switch, "RIGHT", Spacing, 0)
Switch.Label:SetWidth(WidgetListWidth - SwitchWidth - (Spacing * 4))
Switch.Label:SetWidth(WidgetListWidth - SwitchWidth - 40, WidgetHeight)
Switch.Label:SetJustifyH("LEFT")
Switch.Label:SetFontObject(K.UIFont)
Switch.Label:SetText(text)
Expand Down
102 changes: 101 additions & 1 deletion KkthnxUI/Developer/Core.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local K, C, L = KkthnxUI[1], KkthnxUI[2], KkthnxUI[3]
-- local Module = K:NewModule("Developer")
local Module = K:NewModule("Developer")

K.Devs = {
["Kkthnx-Area 52"] = true,
Expand All @@ -14,3 +14,103 @@ K.isDeveloper = isDeveloper
if not K.isDeveloper then
return
end

local _G = _G
local ShowUIPanel = ShowUIPanel
local GetInstanceInfo = GetInstanceInfo
local InCombatLockdown = InCombatLockdown

local C_TalkingHead_SetConversationsDeferred = C_TalkingHead.SetConversationsDeferred

local Config_ObjectiveFrameAutoHideInKeystone = true
local Config_ObjectiveFrameAutoHide = true

local function IsQuestTrackerLoaded()
return C_AddOns.IsAddOnLoaded("!KalielsTracker") or C_AddOns.IsAddOnLoaded("DugisGuideViewerZ")
end

local function IsObjectiveTrackerCollapsed(frame)
return frame:GetParent() == K.UIFrameHider
end

local function CollapseObjectiveTracker(frame)
frame:SetParent(K.UIFrameHider)
end

local function ExpandObjectiveTracker(frame)
frame:SetParent(_G.UIParent)
end

local function AutoHideObjectiveTrackerOnShow()
local tracker = _G.ObjectiveTrackerFrame
if tracker and IsObjectiveTrackerCollapsed(tracker) then
ExpandObjectiveTracker(tracker)
end
end

local function AutoHideObjectiveTrackerOnHide()
local tracker = _G.ObjectiveTrackerFrame
if not tracker or IsObjectiveTrackerCollapsed(tracker) then
return
end

if Config_ObjectiveFrameAutoHideInKeystone then
CollapseObjectiveTracker(tracker)
else
local _, _, difficultyID = GetInstanceInfo()
if difficultyID ~= 8 then -- ignore hide in keystone runs
CollapseObjectiveTracker(tracker)
end
end
end

local function AutoHideObjectiveTracker()
local tracker = _G.ObjectiveTrackerFrame
if not tracker then
return
end

if not AutoHider then
AutoHider = CreateFrame("Frame", nil, UIParent, "SecureHandlerStateTemplate")
AutoHider:SetAttribute("_onstate-objectiveHider", "if newstate == 1 then self:Hide() else self:Show() end")
AutoHider:SetScript("OnHide", AutoHideObjectiveTrackerOnHide)
AutoHider:SetScript("OnShow", AutoHideObjectiveTrackerOnShow)
end

if Config_ObjectiveFrameAutoHide then
RegisterStateDriver(AutoHider, "objectiveHider", "[@arena1,exists][@arena2,exists][@arena3,exists][@arena4,exists][@arena5,exists][@boss1,exists][@boss2,exists][@boss3,exists][@boss4,exists][@boss5,exists]1;0")
else
UnregisterStateDriver(AutoHider, "objectiveHider")
AutoHideObjectiveTrackerOnShow() -- reshow it when needed
end
end

local function SplashFrame_OnHide(frame)
local fromGameMenu = frame.screenInfo and frame.screenInfo.gameMenuRequest
frame.screenInfo = nil

C_TalkingHead_SetConversationsDeferred(false)
_G.AlertFrame:SetAlertsEnabled(true, "splashFrame")

if fromGameMenu and not frame.showingQuestDialog and not InCombatLockdown() then
ShowUIPanel(_G.GameMenuFrame)
end

frame.showingQuestDialog = nil
end

local function SetupObjectiveTracker()
AutoHideObjectiveTracker()

local splash = _G.SplashFrame
if splash then
splash:SetScript("OnHide", SplashFrame_OnHide)
end
end

-- Module's OnEnable function.
function Module:OnEnable()
if not IsQuestTrackerLoaded() then
SetupObjectiveTracker()
end
end
6 changes: 3 additions & 3 deletions KkthnxUI/Libraries/LibAnim/LibAnim.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- LibAnim by Hydra
local Version = 2.901 -- based on 2.03
local Version = 2.902 -- based on 2.03

-- Note, deprecated items will be removed next version.
-- Please update your usage accordingly. (ctrl + f - "Deprecated")
Expand Down Expand Up @@ -1102,11 +1102,11 @@ Update.color = function(self, elapsed, i)
elseif self.children then
self.ColorOffset = Easing[self.Easing](self.Timer, 0, self.Duration, self.Duration)
for _, child in pairs(self.children) do
Set[self.ColorType](child, GetColor(self.Timer / self.Duration, self.StartR, self.StartG, self.StartB, self.EndR, self.EndG, self.EndB))
Set[self.ColorType](child, GetColor(self.ColorOffset / self.Duration, self.StartR, self.StartG, self.StartB, self.EndR, self.EndG, self.EndB))
end
else
self.ColorOffset = Easing[self.Easing](self.Timer, 0, self.Duration, self.Duration)
Set[self.ColorType](self.Parent, GetColor(self.Timer / self.Duration, self.StartR, self.StartG, self.StartB, self.EndR, self.EndG, self.EndB))
Set[self.ColorType](self.Parent, GetColor(self.ColorOffset / self.Duration, self.StartR, self.StartG, self.StartB, self.EndR, self.EndG, self.EndB))
end
end

Expand Down
Loading

0 comments on commit d36fc7b

Please sign in to comment.