Skip to content

Commit

Permalink
NDui 7.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
siweia committed Feb 3, 2024
1 parent 0718047 commit 953b33e
Show file tree
Hide file tree
Showing 20 changed files with 48 additions and 42 deletions.
1 change: 1 addition & 0 deletions Interface/AddOns/NDui/Config/AuraWatchList/All.lua
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ local list = {
{AuraID = 250585, UnitID = "player", Flash = true}, -- 剧毒之池,阿塔达萨
{AuraID = 258723, UnitID = "player", Flash = true}, -- 怪诞之池,阿塔达萨
{AuraID = 268086, UnitID = "player", Text = L["Move"]}, -- 恐怖光环,庄园
{AuraID = 427513, UnitID = "player", Flash = true}, -- 剧毒释放,永茂林地

{AuraID = 426249, UnitID = "player", Flash = true}, -- 炽焰融合,拉罗达尔
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ module:RegisterDebuff(TIER, INSTANCE, 0, 169341) -- 挫志怒吼
module:RegisterDebuff(TIER, INSTANCE, 0, 172963, 6) -- 破门斩斧

INSTANCE = 556 -- 永茂林地
module:RegisterSeasonSpells(TIER, INSTANCE)
module:RegisterSeasonSpells(TIER, INSTANCE)
module:RegisterDebuff(TIER, INSTANCE, 0, 428084, 6) -- 冰川融聚
20 changes: 10 additions & 10 deletions Interface/AddOns/NDui/Core/Changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ if DB.Client ~= "zhCN" then return end
local strsplit, pairs = string.split, pairs

local hx = {
"鼠标提示更新",
"姓名板法术过滤更新",
"更新部分法术监控",
"更新信息条的套装充能",
"添加选项以修改姓名板名字偏移",
"修正无法发送宏技能的冷却时间的问题",
"动作条冷却发送治疗石计数",
"修正预创建下PGF的排序失效的问题",
"修正一个RaiderIO可能引起的报错",
"冲突插件按钮可以正确禁用插件",
"oUF更新",
"移除对旧版本的兼容",
"技能监控的栏位分组更新",
"修正颜色选择器",
"更新信息条时间模块",
"界面美化更新",
"添加选项以开关额外能量条",
"本地文本更新",
"修正开启头衔显示时,目标名字获取异常的问题",
"更新部分法术监控",
}

local f
Expand Down
2 changes: 0 additions & 2 deletions Interface/AddOns/NDui/Locales/deDE.lua
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ L["NFG"] = "No guild fund"
L["AutoSell Junk"] = "Autosell Junk"
L["D"] = "Dur"
L["Low Durability"] = "You have slots in low durability!"
L["Hands"] = "Hands"
L["Feet"] = "Feet"
L["Player Panel"] = "Open CharacterFrame"
L["Auto Repair"] = "AutoRepair"
L["Guild repair"] = "Repair cost covered by G-Bank"
Expand Down
2 changes: 0 additions & 2 deletions Interface/AddOns/NDui/Locales/enUS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ L["NFG"] = "No guild fund"
L["AutoSell Junk"] = "Autosell Junk"
L["D"] = "Dur"
L["Low Durability"] = "You have slots in low durability!"
L["Hands"] = "Hands"
L["Feet"] = "Feet"
L["Player Panel"] = "Open CharacterFrame"
L["Auto Repair"] = "AutoRepair"
L["Guild repair"] = "Repair cost covered by G-Bank"
Expand Down
2 changes: 0 additions & 2 deletions Interface/AddOns/NDui/Locales/frFR.lua
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ L["NFG"] = "Pas de fonds de guilde"
L["AutoSell Junk"] = "Vente automatique des objets gris"
L["D"] = "Dur"
L["Low Durability"] = "Vous avez des objets de faible durabilité!"
L["Hands"] = "Mains"
L["Feet"] = "Pieds"
L["Player Panel"] = "Ouvrir la fenêtre du personnage"
L["Auto Repair"] = "Réparation automatique"
L["Guild repair"] = "Coût de réparation couvert par la banque de guilde"
Expand Down
2 changes: 0 additions & 2 deletions Interface/AddOns/NDui/Locales/ruRU.lua
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ L["NFG"] = "Не согильдиец"
L["AutoSell Junk"] = "Автопродажа хлама"
L["D"] = "Пр"
L["Low Durability"] = "Вашим вещам требуется ремонт!"
L["Hands"] = "Кисти рук"
L["Feet"] = "Ступни"
L["Player Panel"] = "Открыть окно персонажа"
L["Auto Repair"] = "Автопочинка"
L["Guild repair"] = "Стоимость ремонта покрыла гильдия."
Expand Down
2 changes: 0 additions & 2 deletions Interface/AddOns/NDui/Locales/zhCN.lua
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ L["NFG"] = "不使用公修"
L["AutoSell Junk"] = "自动出售垃圾"
L["D"] = "耐久"
L["Low Durability"] = "你的装备耐久度过低!"
L["Hands"] = "手部"
L["Feet"] = "脚部"
L["Player Panel"] = "角色面板"
L["Auto Repair"] = "自动修理"
L["Guild repair"] = "你偷偷用了公会修理"
Expand Down
2 changes: 0 additions & 2 deletions Interface/AddOns/NDui/Locales/zhTW.lua
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ L["NFG"] = "不使用公修"
L["AutoSell Junk"] = "自動販賣雜物"
L["D"] = "耐久"
L["Low Durability"] = "你的裝備耐久度過低!"
L["Hands"] = "手部"
L["Feet"] = "腳部"
L["Player Panel"] = "角色面板"
L["Auto Repair"] = "自動修理"
L["Guild repair"] = "修理使用了公會銀行"
Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/NDui/Modules/ActionBar/Bars/MicroMenu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function Bar:MicroButton_Create(parent, data)
local hl = button:GetHighlightTexture()
Bar:MicroButton_SetupTexture(hl, texture)
hooksecurefunc(button, "SetHighlightAtlas", function()
hl:SetTexture(DB.MicroTex..texture)
button:SetHighlightTexture(DB.MicroTex..texture)
hl:SetBlendMode("ADD")
end)
if not C.db["Skins"]["ClassLine"] then hl:SetVertexColor(1, 1, 1) end
Expand Down
4 changes: 2 additions & 2 deletions Interface/AddOns/NDui/Modules/Infobar/Durability.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ local localSlots = {
[3] = {5, INVTYPE_CHEST, 1000},
[4] = {6, INVTYPE_WAIST, 1000},
[5] = {9, INVTYPE_WRIST, 1000},
[6] = {10, L["Hands"], 1000},
[6] = {10, INVTYPE_HAND, 1000},
[7] = {7, INVTYPE_LEGS, 1000},
[8] = {8, L["Feet"], 1000},
[8] = {8, INVTYPE_FEET, 1000},
[9] = {16, INVTYPE_WEAPONMAINHAND, 1000},
[10] = {17, INVTYPE_WEAPONOFFHAND, 1000}
}
Expand Down
7 changes: 4 additions & 3 deletions Interface/AddOns/NDui/Modules/Infobar/Time.lua
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ local questlist = {
{name = L["Timewarped"], id = 55499, texture = 1129683}, -- WoD
{name = L["Timewarped"], id = 64710, texture = 1467047}, -- Legion
{name = GetSpellInfo(388945), id = 70866}, -- SoDK
{name = "", id = 70906, questName = true}, -- Grand hunt
{name = "", id = 70906, itemID = 200468}, -- Grand hunt
{name = "", id = 70893, questName = true}, -- Community feast
{name = "", id = 79226, questName = true}, -- The big dig
{name = "", id = 78319, questName = true}, -- The superbloom
}

local lesserVisions = {58151, 58155, 58156, 58167, 58168}
Expand Down Expand Up @@ -242,7 +243,7 @@ local function GetFormattedTimeLeft(timeLeft)
end

local itemCache = {}
local function GetItemLink(itemID) -- deprecated, needs review
local function GetItemLink(itemID)
local link = itemCache[itemID]
if not link then
link = select(2, GetItemInfo(itemID))
Expand Down Expand Up @@ -328,7 +329,7 @@ info.onEnter = function(self)
if v.name and IsQuestFlaggedCompleted(v.id) then
if v.name == L["Timewarped"] and isTimeWalker and checkTexture(v.texture) or v.name ~= L["Timewarped"] then
addTitle(QUESTS_LABEL)
GameTooltip:AddDoubleLine(v.questName and QuestUtils_GetQuestName(v.id) or v.name, QUEST_COMPLETE, 1,1,1, 1,0,0)
GameTooltip:AddDoubleLine((v.itemID and GetItemLink(v.itemID)) or (v.questName and QuestUtils_GetQuestName(v.id)) or v.name, QUEST_COMPLETE, 1,1,1, 1,0,0)
end
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -395,15 +395,17 @@ C.themes["Blizzard_EncounterJournal"] = function()
B.StripTextures(frame)
B.ReskinTrimScroll(frame.ScrollBar)

local function replaceTextColor(container)
container.NameText:SetTextColor(1, 1, 1)
local function replaceBlackColor(text, r, g, b)
if r == 0 and g == 0 and b == 0 then
text:SetTextColor(.7, .7, .7)
end
end

local function handleText(button)
local container = button.TextContainer
if container and not container.styled then
replaceTextColor(container)
hooksecurefunc(container, "UpdateTextColor", replaceTextColor)
hooksecurefunc(container.NameText, "SetTextColor", replaceBlackColor)
hooksecurefunc(container.ConditionsText, "SetTextColor", replaceBlackColor)
container.styled = true
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ C.themes["Blizzard_PerksProgram"] = function()
B.ReskinIcon(productsFrame.PerksProgramCurrencyFrame.Icon)
B.StripTextures(productsFrame.PerksProgramProductDetailsContainerFrame)
B.SetBD(productsFrame.PerksProgramProductDetailsContainerFrame)
B.ReskinTrimScroll(productsFrame.PerksProgramProductDetailsContainerFrame.SetDetailsScrollBoxContainer.ScrollBar)

local productsContainer = productsFrame.ProductsScrollBoxContainer
B.StripTextures(productsContainer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ C.themes["Blizzard_ProfessionsCustomerOrders"] = function()
reskinContainer(qualityDialog["Container"..i])
end

B.Reskin(frame.Form.OrderRecipientDisplay.SocialDropdownButton)

-- Orders
B.Reskin(frame.MyOrdersPage.RefreshButton)
frame.MyOrdersPage.RefreshButton.__bg:SetInside(nil, 3, 3)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,10 @@ tinsert(C.defaultThemes, function()
-- Item frame
local function ReskinLootButton(button)
if not button.styled then
if button.NameFrame then
button.NameFrame:SetAlpha(0)
end
if button.BorderFrame then
button.BorderFrame:SetAlpha(0)
B.CreateBDFrame(button.BorderFrame, .25)
if button.BackgroundArtFrame then
button.BackgroundArtFrame.NameFrame:SetAlpha(0)
button.BackgroundArtFrame.BorderFrame:SetAlpha(0)
B.CreateBDFrame(button.BackgroundArtFrame.BorderFrame, .25)
end
local item = button.Item
if item then
Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/NDui/Modules/Tooltip/Tip.lua
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ function TT:OnTooltipSetUnit()
unitFullName = name.."-"..(realm or DB.MyRealm)
local pvpName = UnitPVPName(unit)
local relationship = UnitRealmRelationship(unit)
if not C.db["Tooltip"]["HideTitle"] and pvpName then
if not C.db["Tooltip"]["HideTitle"] and pvpName and pvpName ~= "" then
name = pvpName
end
if realm and realm ~= "" then
Expand Down
2 changes: 1 addition & 1 deletion Interface/AddOns/NDui/NDui.toc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
## X-Credits: Elv, Freebaser, Haleth, Haste, lightspark, Loshine, Neavo, p3lim, Paopao001, Qulight, Ray, Rubgrsch, Simpy, Tuller, zork.
## Author: Siweia
## Notes: Empty toc for Curseforge
## Version: 7.16.2
## Version: 7.17.0
## X-Support: DF
## X-Website: https://github.com/siweia/NDui
2 changes: 1 addition & 1 deletion Interface/AddOns/NDui/NDui_Mainline.toc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## X-Credits: Elv, Freebaser, Haleth, Haste, lightspark, Loshine, Neavo, p3lim, Paopao001, Qulight, Ray, Rubgrsch, Simpy, Tuller, zork.
## Author: Siweia
## Notes: More than a UI.
## Version: 7.16.2
## Version: 7.17.0
## X-Support: DF
## X-Website: https://github.com/siweia/NDui
## X-Curse-Project-ID: 324377
Expand Down
12 changes: 12 additions & 0 deletions Interface/Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@
- 配置文件夹位于Interface\Addons\NDui\Config;
- 控制台无法调整的设置可以在里面找到。
---------------------------------------------------------
2024/2/3 v7.17.0
- oUF更新;
- 移除对旧版本的兼容;
- 技能监控的栏位分组更新;
- 修正颜色选择器;
- 更新信息条时间模块;
- 界面美化更新;
- 添加选项以开关额外能量条;
- 本地文本更新;
- 修正开启头衔显示时,目标名字获取异常的问题;
- 更新部分法术监控。

2024/1/1 v7.16.0
- 鼠标提示更新;
- 姓名板法术过滤更新;
Expand Down

0 comments on commit 953b33e

Please sign in to comment.