Skip to content

Commit

Permalink
Maintenance patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Tercioo committed Mar 4, 2022
1 parent e9b27b6 commit af62ebb
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 78 deletions.
2 changes: 1 addition & 1 deletion Libs/DF/fw.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


local dversion = 287
local dversion = 289
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)

Expand Down
23 changes: 19 additions & 4 deletions Libs/DF/spells.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)

Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 8 additions & 2 deletions boot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.",
Expand Down
47 changes: 22 additions & 25 deletions core/control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions core/parser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -5263,6 +5265,8 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
end
end
--]=]


end

Expand Down
Loading

0 comments on commit af62ebb

Please sign in to comment.