xiconfjs/Gladdy-TBC
1
0
Fork 0
Code Issues 36 Pull Requests 2 Packages Projects Releases 30 Wiki Activity

Merge branch 'hotfix/totemplates-fix' into main

Browse Source
This commit is contained in:
Sumsebrum 2021-06-15 09:10:55 +02:00
commit 9d26713dc1
4 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gladdy.lua
View File

@ -25,7 +25,7 @@ local MAJOR, MINOR = "Gladdy", 4
local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
local L local L
Gladdy.version_major_num = 1 Gladdy.version_major_num = 1
Gladdy.version_minor_num = 0.10 Gladdy.version_minor_num = 0.11
Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
Gladdy.version_releaseType = RELEASE_TYPES.beta Gladdy.version_releaseType = RELEASE_TYPES.beta
Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType

2
Gladdy.toc
View File

@ -1,6 +1,6 @@
## Interface: 20501 ## Interface: 20501
## Title: Gladdy - TBC ## Title: Gladdy - TBC
## Version: 1.10-Beta ## Version: 1.11-Beta
## Notes: The most powerful arena AddOn for WoW 2.5.1 ## Notes: The most powerful arena AddOn for WoW 2.5.1
## Author: XiconQoo, DnB_Junkee, Knall ## Author: XiconQoo, DnB_Junkee, Knall
## X-Email: contact me on discord Knall#1751 ## X-Email: contact me on discord Knall#1751

40
Modules/TotemPlates.lua
View File

@ -97,7 +97,7 @@ local function GetTotemColorDefaultOptions()
return a.name < b.name return a.name < b.name
end) end)
for i=1,#indexedList do for i=1,#indexedList do
defaultDB["totem" .. indexedList[i].id] = {color = indexedList[i].color, enabled = indexedList[i].enabled, alpha = 0.6} defaultDB["totem" .. indexedList[i].id] = {color = indexedList[i].color, enabled = indexedList[i].enabled, alpha = 0.6, customText = ""}
options["totem" .. indexedList[i].id] = { options["totem" .. indexedList[i].id] = {
order = i+1, order = i+1,
name = select(1, GetSpellInfo(indexedList[i].id)), name = select(1, GetSpellInfo(indexedList[i].id)),
@ -163,12 +163,12 @@ local function GetTotemColorDefaultOptions()
end end
}, },
customText = { customText = {
type = "input", type = "input",
name = L["Custom totem name"], name = L["Custom totem name"],
order = 5, order = 5,
width = "full", width = "full",
get = function(info) return Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].customText end, get = function(info) return Gladdy.db.npTotemColors["totem" .. indexedList[i].id].customText end,
set = function(info, value) Gladdy.dbi.profile.npTotemColors["totem" .. indexedList[i].id].customText = value Gladdy:UpdateFrame() end set = function(info, value) Gladdy.db.npTotemColors["totem" .. indexedList[i].id].customText = value Gladdy:UpdateFrame() end
}, },
} }
} }
@ -228,6 +228,20 @@ function TotemPlates:Initialize()
self:RegisterEvent("NAME_PLATE_UNIT_REMOVED") self:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
self:RegisterEvent("PLAYER_TARGET_CHANGED") self:RegisterEvent("PLAYER_TARGET_CHANGED")
self:SetScript("OnEvent", TotemPlates.OnEvent) self:SetScript("OnEvent", TotemPlates.OnEvent)
if Gladdy.db.npTotems and Gladdy.db.npTotemsShowEnemy then
--GetCVar("nameplateShowEnemyTotems")
--SetCVar("nameplateShowEnemyTotems", true);
end
if Gladdy.db.npTotems and Gladdy.db.npTotemsShowFriendly then
--GetCVar("nameplateShowFriendlyTotems")
--SetCVar("nameplateShowFriendlyTotems", true);
end
--NeatPlates
--ELVUI
--Plater
--KUI
--threatplates
end end
function TotemPlates:PLAYER_ENTERING_WORLD() function TotemPlates:PLAYER_ENTERING_WORLD()
@ -332,15 +346,14 @@ function TotemPlates:NAME_PLATE_UNIT_ADDED(...)
TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID) TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID)
nameplate.UnitFrame:SetAlpha(0) nameplate.UnitFrame:SetAlpha(0)
nameplate.UnitFrame.point = select(2, nameplate.UnitFrame.selectionHighlight:GetPoint())
nameplate.UnitFrame.selectionHighlight:ClearAllPoints() nameplate.UnitFrame.selectionHighlight:ClearAllPoints()
nameplate.UnitFrame.selectionHighlight:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT", Gladdy.db.npTotemPlatesSize/16, -Gladdy.db.npTotemPlatesSize/16) nameplate.UnitFrame.selectionHighlight:SetPoint("TOPLEFT", nameplate.gladdyTotemFrame, "TOPLEFT", Gladdy.db.npTotemPlatesSize/16, -Gladdy.db.npTotemPlatesSize/16)
nameplate.UnitFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT", -Gladdy.db.npTotemPlatesSize/16, Gladdy.db.npTotemPlatesSize/16) nameplate.UnitFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", nameplate.gladdyTotemFrame, "BOTTOMRIGHT", -Gladdy.db.npTotemPlatesSize/16, Gladdy.db.npTotemPlatesSize/16)
nameplate.UnitFrame:SetScript("OnHide", function(unitFrame) nameplate.UnitFrame:SetScript("OnHide", function(unitFrame)
unitFrame:SetAlpha(1) unitFrame:SetAlpha(1)
unitFrame.selectionHighlight:ClearAllPoints() unitFrame.selectionHighlight:ClearAllPoints()
unitFrame.selectionHighlight:SetPoint("TOPLEFT", unitFrame.point, "TOPLEFT") unitFrame.selectionHighlight:SetPoint("TOPLEFT", unitFrame.healthBar.barTexture, "TOPLEFT")
unitFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", unitFrame.point, "BOTTOMRIGHT") unitFrame.selectionHighlight:SetPoint("BOTTOMRIGHT", unitFrame.healthBar.barTexture, "BOTTOMRIGHT")
unitFrame:SetScript("OnHide", nil) unitFrame:SetScript("OnHide", nil)
end) end)
self.activeTotemNameplates[unitID] = nameplate self.activeTotemNameplates[unitID] = nameplate
@ -439,6 +452,7 @@ function TotemPlates:GetOptions()
min = 20, min = 20,
max = 100, max = 100,
step = 1, step = 1,
width = "full",
}), }),
npTotemPlatesWidthFactor = Gladdy:option({ npTotemPlatesWidthFactor = Gladdy:option({
type = "range", type = "range",
@ -448,6 +462,7 @@ function TotemPlates:GetOptions()
min = 0.5, min = 0.5,
max = 2, max = 2,
step = 0.05, step = 0.05,
width = "full",
}), }),
}, },
}, },
@ -477,6 +492,7 @@ function TotemPlates:GetOptions()
min = 1, min = 1,
max = 50, max = 50,
step = 0.1, step = 0.1,
width = "full",
}), }),
npTremorFontXOffset = Gladdy:option({ npTremorFontXOffset = Gladdy:option({
type = "range", type = "range",
@ -486,6 +502,7 @@ function TotemPlates:GetOptions()
min = -300, min = -300,
max = 300, max = 300,
step = 1, step = 1,
width = "full",
}), }),
npTremorFontYOffset = Gladdy:option({ npTremorFontYOffset = Gladdy:option({
type = "range", type = "range",
@ -495,6 +512,7 @@ function TotemPlates:GetOptions()
min = -300, min = -300,
max = 300, max = 300,
step = 1, step = 1,
width = "full",
}), }),
}, },
}, },
@ -528,7 +546,7 @@ function TotemPlates:GetOptions()
min = 0, min = 0,
max = 1, max = 1,
step = 0.1, step = 0.1,
width = "double", width = "full",
order = 23, order = 23,
get = function(info) get = function(info)
local alphas = GetTotemOptions() local alphas = GetTotemOptions()

5
README.md
View File

@ -1,7 +1,7 @@
# Gladdy - TBC # Gladdy - TBC
### The most powerful arena addon for WoW TBC 2.5.1 ### The most powerful arena addon for WoW TBC 2.5.1
## [v1.10-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.10-Beta/Gladdy_TBC-Classic_v1.10-Beta.zip) ## [v1.11-Beta Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.11-Beta/Gladdy_TBC-Classic_v1.11-Beta.zip)
###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
@ -39,6 +39,9 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
### Changes ### Changes
### v1.11-Beta
- TotemPlates fix after blizzard update
### v1.10-Beta ### v1.10-Beta
- fix german and russian client not working - fix german and russian client not working
- ArenaCountdown loacalization now working for all languages (except itIT...beta has no option to select italian) - ArenaCountdown loacalization now working for all languages (except itIT...beta has no option to select italian)