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

Maintenance patch

Browse Source
This commit is contained in:
Tercio Jose
2022-03-04 16:05:48 -03:00
parent e9b27b60de
commit af62ebb71f
6 changed files with 121 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/DF/fw.lua
+1 -1
View File
@@ -1,6 +1,6 @@
local dversion = 287
local dversion = 289
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)
Libs/DF/spells.lua
+19 -4
View File
@@ -915,12 +915,15 @@ DF.CooldownsInfo = {
DF.CrowdControlSpells = {
[5246] = "WARRIOR", --Intimidating Shout
[132168] = "WARRIOR", --Shockwave (debuff spellid)
[6552] = "WARRIOR", --Pummel
[132169] = "WARRIOR", --Storm Bolt (talent debuff spellid)
[118699] = "WARLOCK", --Fear (debuff spellid)
[6789] = "WARLOCK", --Mortal Coil
[19647] = "WARLOCK", --Spelllock
[30283] = "WARLOCK", --Shadowfury
[710] = "WARLOCK", --Banish
[212619] = "WARLOCK", --Call Fellhunt
[5484] = "WARLOCK", --Howl of Terror (talent)
[118] = "MAGE", --Polymorph
@@ -933,6 +936,7 @@ DF.CrowdControlSpells = {
[61721] = "MAGE", --Polymorph Rabbit
[28272] = "MAGE", --Polymorph Pig
[277792] = "MAGE", --Polymorph Bumblebee
[2139] = "MAGE", --Counterspell
[82691] = "MAGE", --Ring of Frost (debuff spellid)
[122] = "MAGE", --Frost Nova
@@ -947,19 +951,26 @@ DF.CrowdControlSpells = {
[200200] = "PRIEST", --Holy Word: Chastise (talent debuff spellid)
[226943] = "PRIEST", --Mind Bomb (talent)
[64044] = "PRIEST", --Psychic Horror (talent)
[15487] = "PRIEST", --Silence
[2094] = "ROGUE", --Blind
[1833] = "ROGUE", --Cheap Shot
[408] = "ROGUE", --Kidney Shot
[1766] = "ROGUE", --Kick
[6770] = "ROGUE", --Sap
[1776] = "ROGUE", --Gouge
[853] = "PALADIN", --Hammer of Justice
[96231] = "PALADIN", --Rebuke (tank)
[20066] = "PALADIN", --Repentance (talent)
[105421] = "PALADIN", --Blinding Light (talent)
[31935] = "PALADIN", --Avengers Shield
[217824] = "PALADIN", --Shield of Virtue
[221562] = "DEATHKNIGHT", --Asphyxiate
[108194] = "DEATHKNIGHT", --Asphyxiate (talent)
[47528] = "DEATHKNIGHT", --Mind Frezer
[91807] = "DEATHKNIGHT", --Shab Rush
[207167] = "DEATHKNIGHT", --Blinding Sleet
[334693] = "DEAHTKNIGHT", --Absolute Zero (legendary)
@@ -975,9 +986,12 @@ DF.CrowdControlSpells = {
[50259] = "DRUID", --Dazed (from Wild Charge)
[209753] = "DRUID", --Cyclone (from pvp talent)
[33786] = "DRUID", --Cyclone (from pvp talent - resto druid)
[93985] = "DRUID", --Skullbash
[163505] = "DRUID", --Rake
[127797] = "DRUID", --Ursol's Vortex
[147362] = "HUNTER", --Countershot
[187707] = "HUNTER", --Muzzle
[3355] = "HUNTER", --Freezing Trap / Diamond Ice (from pvp talent)
[19577] = "HUNTER", --Intimidation
[190927] = "HUNTER", --Harpoon
@@ -991,6 +1005,7 @@ DF.CrowdControlSpells = {
[198909] = "MONK", --Song of Chi-Ji (talent)
[116706] = "MONK", --Disable
[107079] = "MONK", --Quaking Palm (racial)
[116705] = "MONK", --Spear kick
[118905] = "SHAMAN", --Static Charge (Capacitor Totem)
[51514] = "SHAMAN", --Hex
@@ -1002,6 +1017,7 @@ DF.CrowdControlSpells = {
[277778] = "SHAMAN", --Hex (Zandalari Tendonripper)
[277784] = "SHAMAN", --Hex (Wicker Mongrel)
[309328] = "SHAMAN", --Hex (Living Honey)
[57994] = "SHAMAN", --Wind Shear
[64695] = "SHAMAN", --Earthgrab (talent)
[197214] = "SHAMAN", --Sundering (talent)
@@ -1010,6 +1026,7 @@ DF.CrowdControlSpells = {
[200166] = "DEMONHUNTER", --Metamorphosis
[207685] = "DEMONHUNTER", --Sigil of Misery
[211881] = "DEMONHUNTER", -- Fel Eruption
[183752] = "DEMONHUNTER", --Disrupt
[331866] = "COVENANT|VENTHYR", --Agent of Chaos (Nadia soulbind)
}
@@ -1337,13 +1354,11 @@ DF.PotionIDs = {
DF.FeastIDs = {
[308462] = true, --Feast of Gluttonous Hedonism
[307153] = true, --Eternal Cauldron
}
DF.RuneIDs = {
[347901] = true, --Veiled Augmentation
[367405] = true, --Eternal Augmentation
}
-- /dump UnitAura ("player", 1)
boot.lua
+8 -2
View File
@@ -6,8 +6,8 @@
local version, build, date, tocversion = GetBuildInfo()
_detalhes.build_counter = 9696
_detalhes.alpha_build_counter = 9696 --if this is higher than the regular counter, use it instead
_detalhes.build_counter = 9699
_detalhes.alpha_build_counter = 9699 --if this is higher than the regular counter, use it instead
_detalhes.bcc_counter = 31
_detalhes.dont_open_news = true
_detalhes.game_version = version
@@ -33,6 +33,12 @@ do
local Loc = _G.LibStub("AceLocale-3.0"):GetLocale( "Details" )
local news = {
{"v9.2.0.9699.146", "Merch 04th, 2022"},
"Align Text Columns now have a warning at the bracket and separators option",
"Silence from interrupts shall be counted as a crowd control.",
"More phrases in the options panel has been added to translation.",
"A revamp has beed started on the erase data prompt.",
{"v9.2.0.9696.146", "February 24th, 2022"},
"Fixed DPS display when using Aligned Text Columns.",
"Fixed percent showing even it's disabled when using Aligned Text Columns.",
core/control.lua
+22 -25
View File
@@ -480,15 +480,6 @@
Details.leaving_combat = true
Details.last_combat_time = _tempo
--deprecated (combat are now added immediatelly since there's no script run too long)
--if (Details.schedule_remove_overall and not from_encounter_end and not InCombatLockdown()) then
-- if (Details.debug) then
-- Details:Msg ("(debug) found schedule overall data deletion.")
-- end
-- Details.schedule_remove_overall = false
-- Details.tabela_historico:resetar_overall()
--end
Details:CatchRaidBuffUptime ("BUFF_UPTIME_OUT")
Details:CatchRaidDebuffUptime ("DEBUFF_UPTIME_OUT")
Details:CloseEnemyDebuffsUptime()
@@ -1848,39 +1839,45 @@
--> core
function Details:AutoEraseConfirm()
local panel = _G.DetailsEraseDataConfirmation
if (not panel) then
panel = CreateFrame ("frame", "DetailsEraseDataConfirmation", UIParent, "BackdropTemplate")
panel:SetSize (400, 85)
panel:SetBackdrop ({bgFile = [[Interface\AddOns\Details\images\background]], tile = true, tileSize = 16,
panel = CreateFrame("frame", "DetailsEraseDataConfirmation", UIParent, "BackdropTemplate")
panel:SetSize(400, 85)
panel:SetBackdrop({bgFile = [[Interface\AddOns\Details\images\background]], tile = true, tileSize = 16,
edgeFile = [[Interface\AddOns\Details\images\border_2]], edgeSize = 12})
panel:SetPoint ("center", UIParent)
panel:SetBackdropColor (0, 0, 0, 0.4)
panel:SetScript ("OnMouseDown", function (self, button)
panel:SetPoint("center", UIParent)
panel:SetBackdropColor(0, 0, 0, 0.4)
DetailsFramework:ApplyStandardBackdrop(panel)
panel:SetScript("OnMouseDown", function (self, button)
if (button == "RightButton") then
panel:Hide()
end
end)
--local icon = Details.gump:CreateImage (panel, [[Interface\AddOns\Details\images\logotipo]], 512*0.4, 256*0.4)
--icon:SetPoint ("bottomleft", panel, "topleft", -10, -11)
--[=[
create 3 options
- overall data only
- current data only
- both
--=]=]
local text = Details.gump:CreateLabel (panel, Loc ["STRING_OPTIONS_CONFIRM_ERASE"], nil, nil, "GameFontNormal")
text:SetPoint ("center", panel, "center")
text:SetPoint ("top", panel, "top", 0, -10)
local no = Details.gump:CreateButton (panel, function() panel:Hide() end, 90, 20, Loc ["STRING_NO"])
no:SetPoint ("bottomleft", panel, "bottomleft", 30, 10)
no:InstallCustomTexture (nil, nil, nil, nil, true)
local yes = Details.gump:CreateButton (panel, function() panel:Hide(); Details.tabela_historico:resetar() end, 90, 20, Loc ["STRING_YES"])
yes:SetPoint ("bottomright", panel, "bottomright", -30, 10)
yes:InstallCustomTexture (nil, nil, nil, nil, true)
end
panel:Show()
end
core/parser.lua
+4
View File
@@ -5204,6 +5204,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
end
end
--[=[ code maintenance: disabled deprecated code Feb 2022
--deprecated shcedules
do
if (_detalhes.schedule_add_to_overall and #_detalhes.schedule_add_to_overall > 0) then --deprecated (combat are now added immediatelly since there's no script run too long)
@@ -5263,6 +5265,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
end
end
--]=]
end
frames/window_options2_sections.lua
+67 -46
View File
@@ -1501,7 +1501,7 @@ do
},
{type = "blank"},
{type = "label", get = function() return "Aligned Text Columns" end, text_template = subSectionTitleTextTemplate}, --localize-me
{type = "label", get = function() return Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS"] end, text_template = subSectionTitleTextTemplate},
{--inline text enabled
type = "toggle",
@@ -1513,7 +1513,7 @@ do
afterUpdate()
end,
name = Loc ["STRING_ENABLED"],
desc = "Vertically align texts in the right side as a vertical line.",
desc = Loc ["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_DESC"],
},
{--lineText2 (left, usuali is the 'done' amount)
@@ -1527,8 +1527,8 @@ do
min = 0,
max = 125,
step = 1,
name = "Text 1 Offset",
desc = "Offset from right border",
name = string.format(Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_OFFSET"], 1),
desc = Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_OFFSET_DESC"],
},
{--lineText3 (in the middle)
@@ -1542,8 +1542,8 @@ do
min = 0,
max = 75,
step = 1,
name = "Text 2 Offset",
desc = "Offset from right border",
name = string.format(Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_OFFSET"], 2),
desc = Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_OFFSET_DESC"],
},
{--lineText4 (closest to the right)
@@ -1557,8 +1557,8 @@ do
min = 0,
max = 50,
step = 1,
name = "Text 3 Offset",
desc = "Offset from right border",
name = string.format(Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_OFFSET"], 3),
desc = Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_OFFSET_DESC"],
},
{type = "blank"},
@@ -1683,7 +1683,7 @@ do
local sectionOptions = {
{type = "label", get = function() return Loc ["STRING_OPTIONS_GENERAL_ANCHOR"] end, text_template = subSectionTitleTextTemplate},
{--text color
{--text color 1
type = "color",
get = function()
local r, g, b = unpack(currentInstance.row_info.fixed_text_color)
@@ -1696,7 +1696,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_FIXEDCOLOR"],
desc = Loc ["STRING_OPTIONS_TEXT_FIXEDCOLOR_DESC"],
},
{--text size
{--text size 2
type = "range",
get = function() return currentInstance.row_info.font_size end,
set = function (self, fixedparam, value)
@@ -1709,7 +1709,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_SIZE"],
desc = Loc ["STRING_OPTIONS_TEXT_SIZE_DESC"],
},
{--text font
{--text font 3
type = "select",
get = function() return currentInstance.row_info.font_face end,
values = function()
@@ -1718,7 +1718,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_FONT"],
desc = Loc ["STRING_OPTIONS_TEXT_FONT_DESC"],
},
{--percent type
{--percent type 4
type = "select",
get = function() return currentInstance.row_info.percent_type end,
values = function()
@@ -1729,11 +1729,11 @@ do
},
{type = "blank"},
--left text options
{type = "blank"}, --5
--left text options 6
{type = "label", get = function() return Loc ["STRING_OPTIONS_TEXT_LEFT_ANCHOR"] end, text_template = subSectionTitleTextTemplate},
{--use class colors
{--use class colors 7
type = "toggle",
get = function() return currentInstance.row_info.textL_class_colors end,
set = function (self, fixedparam, value)
@@ -1743,7 +1743,7 @@ do
name = Loc ["STRING_OPTIONS_BAR_COLORBYCLASS"],
desc = Loc ["STRING_OPTIONS_TEXT_LCLASSCOLOR_DESC"],
},
{--outline
{--outline 8
type = "toggle",
get = function() return currentInstance.row_info.textL_outline end,
set = function (self, fixedparam, value)
@@ -1753,7 +1753,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_LOUTILINE"],
desc = Loc ["STRING_OPTIONS_TEXT_LOUTILINE_DESC"],
},
{--outline small
{--outline small 9
type = "toggle",
get = function() return currentInstance.row_info.textL_outline_small end,
set = function (self, fixedparam, value)
@@ -1763,7 +1763,7 @@ do
name = "Outline", --localize-me
desc = "Text Outline",
},
{--outline small color
{--outline small color 10
type = "color",
get = function()
local r, g, b = unpack(currentInstance.row_info.textL_outline_small_color)
@@ -1776,7 +1776,7 @@ do
name = "Outline Color",
desc = "Outline Color",
},
{--position number
{--position number 11
type = "toggle",
get = function() return currentInstance.row_info.textL_show_number end,
set = function (self, fixedparam, value)
@@ -1786,7 +1786,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_LPOSITION"],
desc = Loc ["STRING_OPTIONS_TEXT_LPOSITION_DESC"],
},
{--translit text
{--translit text 12
type = "toggle",
get = function() return currentInstance.row_info.textL_translit_text end,
set = function (self, fixedparam, value)
@@ -1797,9 +1797,9 @@ do
desc = Loc ["STRING_OPTIONS_TEXT_LTRANSLIT_DESC"],
},
{type = "blank"},
{type = "blank"}, --13
{--custom left text
{--custom left text 14
type = "toggle",
get = function() return currentInstance.row_info.textL_enable_custom_text end,
set = function (self, fixedparam, value)
@@ -1809,7 +1809,7 @@ do
name = Loc ["STRING_OPTIONS_BARLEFTTEXTCUSTOM"],
desc = Loc ["STRING_OPTIONS_BARLEFTTEXTCUSTOM_DESC"],
},
{--open custom text editor
{--open custom text editor 15
type = "execute",
func = function(self)
local callback = function(text)
@@ -1822,15 +1822,15 @@ do
end,
icontexture = [[Interface\GLUES\LOGIN\Glues-CheckBox-Check]],
--icontexcoords = {160/512, 179/512, 142/512, 162/512},
name = "Edit Custom Text", --localize-me
name = Loc ["STRING_OPTIONS_EDIT_CUSTOM_TEXT"],
desc = Loc ["STRING_OPTIONS_OPEN_ROWTEXT_EDITOR"],
},
{type = "breakline"},
--right text options
{type = "breakline"}, --16
--right text options 17
{type = "label", get = function() return Loc ["STRING_OPTIONS_TEXT_RIGHT_ANCHOR"] end, text_template = subSectionTitleTextTemplate},
{--use class colors
{--use class colors 18
type = "toggle",
get = function() return currentInstance.row_info.textR_class_colors end,
set = function (self, fixedparam, value)
@@ -1840,7 +1840,7 @@ do
name = Loc ["STRING_OPTIONS_BAR_COLORBYCLASS"],
desc = Loc ["STRING_OPTIONS_TEXT_LCLASSCOLOR_DESC"],
},
{--outline
{--outline 19
type = "toggle",
get = function() return currentInstance.row_info.textR_outline end,
set = function (self, fixedparam, value)
@@ -1850,7 +1850,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_LOUTILINE"],
desc = Loc ["STRING_OPTIONS_TEXT_LOUTILINE_DESC"],
},
{--outline small
{--outline small 20
type = "toggle",
get = function() return currentInstance.row_info.textR_outline_small end,
set = function (self, fixedparam, value)
@@ -1860,7 +1860,7 @@ do
name = "Outline", --localize-me
desc = "Text Outline",
},
{--outline small color
{--outline small color 21
type = "color",
get = function()
local r, g, b = unpack(currentInstance.row_info.textR_outline_small_color)
@@ -1874,9 +1874,9 @@ do
desc = "Outline Color",
},
{type = "blank"},
{type = "blank"}, --22
{--show total
{--show total --23
type = "toggle",
get = function() return currentInstance.row_info.textR_show_data[1] end,
set = function (self, fixedparam, value)
@@ -1886,7 +1886,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_SHOW_TOTAL"],
desc = Loc ["STRING_OPTIONS_TEXT_SHOW_TOTAL_DESC"],
},
{--show per second
{--show per second 24
type = "toggle",
get = function() return currentInstance.row_info.textR_show_data[2] end,
set = function (self, fixedparam, value)
@@ -1896,7 +1896,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_SHOW_PS"],
desc = Loc ["STRING_OPTIONS_TEXT_SHOW_PS_DESC"],
},
{--show percent
{--show percent 25
type = "toggle",
get = function() return currentInstance.row_info.textR_show_data[3] end,
set = function (self, fixedparam, value)
@@ -1907,9 +1907,9 @@ do
desc = Loc ["STRING_OPTIONS_TEXT_SHOW_PERCENT_DESC"],
},
{type = "blank"},
{type = "blank"}, --26
{--separator
{--separator 27
type = "select",
get = function() return currentInstance.row_info.textR_separator end,
values = function()
@@ -1918,7 +1918,7 @@ do
name = Loc ["STRING_OPTIONS_TEXT_SHOW_SEPARATOR"],
desc = Loc ["STRING_OPTIONS_TEXT_SHOW_SEPARATOR_DESC"],
},
{--brackets
{--brackets 28
type = "select",
get = function() return currentInstance.row_info.textR_bracket end,
values = function()
@@ -1928,9 +1928,11 @@ do
desc = Loc ["STRING_OPTIONS_TEXT_SHOW_BRACKET_DESC"],
},
{type = "blank"},
{type = "label", get = function() return Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS"] .. " (".. Loc["STRING_OPTIONSMENU_ROWSETTINGS"] ..")\n" .. Loc["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_WARNING"] end, text_template = subSectionTitleTextTemplate}, --29
{--custom right text
{type = "blank"}, --30
{--custom right text 31
type = "toggle",
get = function() return currentInstance.row_info.textR_enable_custom_text end,
set = function (self, fixedparam, value)
@@ -1940,7 +1942,7 @@ do
name = Loc ["STRING_OPTIONS_BARLEFTTEXTCUSTOM"],
desc = Loc ["STRING_OPTIONS_BARLEFTTEXTCUSTOM_DESC"],
},
{--open custom text editor
{--open custom text editor 32
type = "execute",
func = function(self)
local callback = function(text)
@@ -1953,13 +1955,31 @@ do
end,
icontexture = [[Interface\GLUES\LOGIN\Glues-CheckBox-Check]],
--icontexcoords = {160/512, 179/512, 142/512, 162/512},
name = "Edit Custom Text", --localize-me
name = Loc ["STRING_OPTIONS_EDIT_CUSTOM_TEXT"],
desc = Loc ["STRING_OPTIONS_OPEN_ROWTEXT_EDITOR"],
},
}
sectionFrame.sectionOptions = sectionOptions
DF:BuildMenu(sectionFrame, sectionOptions, startX, startY-20, heightSize, true, options_text_template, options_dropdown_template, options_switch_template, true, options_slider_template, options_button_template)
local separatorOption = sectionFrame.widget_list[23]
local bracketOption = sectionFrame.widget_list[24]
local warningLabel = sectionFrame.widget_list[25]
Details.options.textSeparatorOption = separatorOption
Details.options.textbracketOption = bracketOption
sectionFrame:SetScript("OnShow", function()
if (currentInstance.use_multi_fontstrings) then
separatorOption:Disable()
bracketOption:Disable()
warningLabel:Show()
else
separatorOption:Enable()
bracketOption:Enable()
warningLabel:Hide()
end
end)
end
tinsert(Details.optionsSection, buildSection)
@@ -3629,10 +3649,11 @@ do
_detalhes:ShowImportWindow (str, nil, "Details! Export Profile")
end
end,
name = "Export Profile", --localize-me
name = Loc["STRING_OPTIONS_EXPORT_PROFILE"],
icontexture = [[Interface\Buttons\UI-GuildButton-MOTD-Up]],
icontexcoords = {1, 0, 0, 1},
},
{--import profile
type = "execute",
func = function(self)
@@ -3642,12 +3663,12 @@ do
end
--prompt text panel returns what the user inserted in the text field in the first argument
DF:ShowTextPromptPanel("Insert a Name for the New Profile:", function (newProfileName) --localize-me
DF:ShowTextPromptPanel(Loc["STRING_OPTIONS_IMPORT_PROFILE_NAME"] .. ":", function (newProfileName)
Details:ImportProfile (profileString, newProfileName)
end)
end, "Details! Import Profile (paste string)") --localize-me
end, Loc["STRING_OPTIONS_IMPORT_PROFILE_PASTE"])
end,
name = "Import Profile", --localize-me
name = Loc["STRING_OPTIONS_IMPORT_PROFILE"],
icontexture = [[Interface\BUTTONS\UI-GuildButton-OfficerNote-Up]],
icontexcoords = {0, 1, 0, 1},
},
@@ -4181,7 +4202,7 @@ do
end,
icontexture = [[Interface\HELPFRAME\OpenTicketIcon]],
icontexcoords = {.1, .9, .1, .9},
name = "Open Broker Text Editor", --localize-me
name = Loc ["STRING_OPTIONS_OPENBROKER"],
desc = Loc ["STRING_OPTIONS_OPEN_ROWTEXT_EDITOR"],
},