Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

Merging Seal of Command on Wrath classic

Browse Source
This commit is contained in:
Tercio Jose
2022-10-10 16:51:56 -03:00
parent 1ed29008aa
commit 69899679e7
63 changed files with 1655 additions and 1638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/DF/auras.lua
+6 -6
View File
@@ -215,7 +215,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
f.OnProfileChanged = on_profile_changed
f.LocTexts = texts
options = options or {}
self.table.deploy (options, aura_panel_defaultoptions)
self.table.deploy(options, aura_panel_defaultoptions)
local f_auto = CreateFrame("frame", "$parent_Automatic", f, "BackdropTemplate")
local f_manual = CreateFrame("frame", "$parent_Manual", f, "BackdropTemplate")
@@ -228,7 +228,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
--check if the texts table is valid and also deploy default values into the table in case some value is nil
texts = (type(texts == "table") and texts) or default_text_for_aura_frame
DF.table.deploy (texts, default_text_for_aura_frame)
DF.table.deploy(texts, default_text_for_aura_frame)
-------------
@@ -815,7 +815,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
local icon = line:CreateTexture("$parentIcon", "overlay")
icon:SetSize(lineHeight - 2, lineHeight - 2)
local name = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
local name = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
DF:SetFontSize (name, 10)
local remove_button = CreateFrame("button", "$parentRemoveButton", line, "UIPanelCloseButton")
@@ -995,7 +995,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
local icon = line:CreateTexture("$parentIcon", "overlay")
icon:SetSize(scroll_line_height - 2, scroll_line_height - 2)
local name = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
local name = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
local remove_button = CreateFrame("button", "$parentRemoveButton", line, "UIPanelCloseButton")
remove_button:SetSize(16, 16)
@@ -1085,7 +1085,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
if (text ~= "") then
--check for more than one spellname
if (text:find (";")) then
for _, spellName in ipairs({strsplit (";", text)}) do
for _, spellName in ipairs({strsplit(";", text)}) do
spellName = self:trim (spellName)
local spellID = get_spellID_from_string (spellName)
@@ -1132,7 +1132,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
if (text ~= "") then
--check for more than one spellname
if (text:find (";")) then
for _, spellName in ipairs({strsplit (";", text)}) do
for _, spellName in ipairs({strsplit(";", text)}) do
spellName = self:trim (spellName)
local spellID = get_spellID_from_string (spellName)
Libs/DF/fw.lua
-9
View File
@@ -107,15 +107,6 @@ function DF.IsShadowlandsWow()
end
end
function DF.GetContainerItemInfo(containerIndex, slotIndex)
if (DF.IsDragonflightAndBeyond()) then
local itemInfo = C_Container.GetContainerItemInfo(containerIndex, slotIndex)
return itemInfo.iconFileID, itemInfo.stackCount, itemInfo.isLocked, itemInfo.quality, itemInfo.isReadable, itemInfo.hasLoot, itemInfo.hyperlink, itemInfo.isFiltered, itemInfo.hasNoValue, itemInfo.itemID, itemInfo.isBound
else
return GetContainerItemInfo(containerIndex, slotIndex)
end
end
local roleBySpecTextureName = {
DruidBalance = "DAMAGER",
DruidFeralCombat = "DAMAGER",
Libs/DF/iteminfo.lua
+27
View File
@@ -0,0 +1,27 @@
local detailsFramework = _G["DetailsFramework"]
if (not detailsFramework or not DetailsFrameworkCanLoad) then
return
end
--namespace
detailsFramework.Items = {}
local containerAPIVersion = 1
if (detailsFramework.IsDragonflightAndBeyond()) then
containerAPIVersion = 2
end
function detailsFramework.Items.GetContainerItemInfo(containerIndex, slotIndex)
if (containerAPIVersion == 2) then
local itemInfo = C_Container.GetContainerItemInfo(containerIndex, slotIndex)
return itemInfo.iconFileID, itemInfo.stackCount, itemInfo.isLocked, itemInfo.quality, itemInfo.isReadable, itemInfo.hasLoot, itemInfo.hyperlink, itemInfo.isFiltered, itemInfo.hasNoValue, itemInfo.itemID, itemInfo.isBound
else
return GetContainerItemInfo(containerIndex, slotIndex)
end
end
function detailsFramework.Items.IsItemSoulbound(containerIndex, slotIndex)
local bIsBound = select(11, detailsFramework.Items.GetContainerItemInfo(containerIndex, slotIndex))
return bIsBound
end
Libs/DF/load.xml
+1
View File
@@ -4,6 +4,7 @@
<Script file="fw.lua"/>
<Script file="mixins.lua"/>
<Script file="util.lua"/>
<Script file="iteminfo.lua"/>
<Script file="addon.lua"/>
<Script file="colors.lua"/>
<Script file="help.lua"/>
Libs/DF/mixins.lua
+2 -2
View File
@@ -253,8 +253,8 @@ detailsFramework.OptionsFunctions = {
BuildOptionsTable = function(self, defaultOptions, userOptions)
self.options = self.options or {}
detailsFramework.table.deploy (self.options, userOptions or {})
detailsFramework.table.deploy (self.options, defaultOptions or {})
detailsFramework.table.deploy(self.options, userOptions or {})
detailsFramework.table.deploy(self.options, defaultOptions or {})
end
}
Libs/DF/normal_bar.lua
+2 -2
View File
@@ -738,12 +738,12 @@ local build_statusbar = function(self)
self.sparktimer:SetBlendMode("ADD")
self.sparktimer:Hide()
self.lefttext = self:CreateFontString ("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
self.lefttext = self:CreateFontString("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
self.lefttext:SetJustifyH("LEFT")
self.lefttext:SetPoint("LEFT", self.icontexture, "RIGHT", 3, 0)
DF:SetFontSize (self.lefttext, 10)
self.righttext = self:CreateFontString ("$parent_TextRight", "OVERLAY", "GameFontHighlight")
self.righttext = self:CreateFontString("$parent_TextRight", "OVERLAY", "GameFontHighlight")
self.righttext:SetJustifyH("LEFT")
DF:SetFontSize (self.righttext, 10)
self.righttext:SetPoint("RIGHT", self, "RIGHT", -3, 0)
Libs/DF/panel.lua
+738 -743
View File
File diff suppressed because it is too large Load Diff
Libs/DF/slider.lua
+3 -3
View File
@@ -566,7 +566,7 @@ DF:Mixin(DFSliderMetaFunctions, DF.FrameMixin)
local do_precision = function(text)
if (type(text) == "string" and text:find ("%.")) then
local left, right = strsplit (".", text)
local left, right = strsplit(".", text)
left = tonumber (left)
right = tonumber (right)
@@ -958,7 +958,7 @@ function DF:NewSwitch (parent, container, name, member, w, h, ltext, rtext, defa
thumb:SetAlpha(0.7)
thumb:SetPoint("left", slider.widget, "left")
local text = slider:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
local text = slider:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
text:SetTextColor (.8, .8, .8, 1)
text:SetPoint("center", thumb, "center")
@@ -1158,7 +1158,7 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
SliderObject.have_tooltip = "Right Click to Type the Value"
end
SliderObject.amt = SliderObject.slider:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
SliderObject.amt = SliderObject.slider:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
local amt = defaultv
if (amt < 10 and amt >= 1) then
Libs/DF/split_bar.lua
+2 -2
View File
@@ -692,12 +692,12 @@ local build_statusbar = function(self)
self.spark:SetSize(32, 32)
self.spark:SetPoint("LEFT", self, "RIGHT", -17, -1)
self.lefttext = self:CreateFontString ("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
self.lefttext = self:CreateFontString("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
DF:SetFontSize (self.lefttext, 10)
self.lefttext:SetJustifyH("left")
self.lefttext:SetPoint("LEFT", self.lefticon, "RIGHT", 3, 0)
self.righttext = self:CreateFontString ("$parent_TextRight", "OVERLAY", "GameFontHighlight")
self.righttext = self:CreateFontString("$parent_TextRight", "OVERLAY", "GameFontHighlight")
DF:SetFontSize (self.righttext, 10)
self.righttext:SetJustifyH("right")
self.righttext:SetPoint("RIGHT", self.righticon, "LEFT", -3, 0)
Libs/DF/textentry.lua
+1 -1
View File
@@ -569,7 +569,7 @@ function DF:NewTextEntry(parent, container, name, member, w, h, func, param1, pa
TextEntryObject.editbox:SetSize(232, 20)
TextEntryObject.editbox:SetBackdrop({bgFile = [["Interface\DialogFrame\UI-DialogBox-Background"]], tileSize = 64, tile = true, edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]], edgeSize = 10, insets = {left = 1, right = 1, top = 0, bottom = 0}})
TextEntryObject.editbox.label = TextEntryObject.editbox:CreateFontString ("$parent_Desc", "OVERLAY", "GameFontHighlightSmall")
TextEntryObject.editbox.label = TextEntryObject.editbox:CreateFontString("$parent_Desc", "OVERLAY", "GameFontHighlightSmall")
TextEntryObject.editbox.label:SetJustifyH("left")
TextEntryObject.editbox.label:SetPoint("RIGHT", TextEntryObject.editbox, "LEFT", -2, 0)
Libs/NickTag-1.0/NickTag-1.0.lua
+1 -1
View File
@@ -853,7 +853,7 @@ do
background_texture:SetTexture(NickTag.background_pool[1][1])
background_texture:SetTexCoord (unpack(NickTag.background_pool[1][3]))
--
local name = avatar_pick_frame:CreateFontString ("AvatarPickFrameName", "overlay", "GameFontHighlightHuge")
local name = avatar_pick_frame:CreateFontString("AvatarPickFrameName", "overlay", "GameFontHighlightHuge")
name:SetPoint("left", avatar_texture, "right", -11, -17)
name:SetText(UnitName ("player"))
---