diff --git a/boot.lua b/boot.lua index f558115c..1214ce93 100644 --- a/boot.lua +++ b/boot.lua @@ -3,9 +3,9 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 4823 + _detalhes.build_counter = 4829 _detalhes.userversion = "v7.3.0." .. _detalhes.build_counter - _detalhes.realversion = 126 --core version + _detalhes.realversion = 127 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" Details = _detalhes diff --git a/gumps/janela_options.lua b/gumps/janela_options.lua index fffa4bd2..d5061e16 100644 --- a/gumps/janela_options.lua +++ b/gumps/janela_options.lua @@ -2344,7 +2344,7 @@ function window:CreateFrame18() --> current dps g:NewLabel (frame18, _, "$parentCurrentDPSAnchor", "currentDPSAnchor", "The Real Current DPS", "GameFontNormal") - local currentDPSTitleDesc = g:NewLabel (frame18, _, "$parentCurrentDPSTitleDescText", "CurrentDPSTitleDescTextLabel", "Show a frame with DPS done only in the last 5 seconds, making it change very quickly when the group uses attack cooldowns.", "GameFontNormal", 10, "white") + local currentDPSTitleDesc = g:NewLabel (frame18, _, "$parentCurrentDPSTitleDescText", "CurrentDPSTitleDescTextLabel", "Show a frame with DPS done only in the last 5 seconds. Useful for arena matches and mythic dungeons.", "GameFontNormal", 10, "white") currentDPSTitleDesc:SetJustifyV ("top") currentDPSTitleDesc:SetSize (270, 40) currentDPSTitleDesc:SetPoint ("topleft", frame18.currentDPSAnchor, "bottomleft", 0, -4) @@ -2382,7 +2382,7 @@ function window:CreateFrame18() --> suppress alerts and tutorial popups - g:NewLabel (frame18, _, "$parentAlertsAndPopupsAnchor", "alertsAndPopupsAnchor", "Settings:", "GameFontNormal") + g:NewLabel (frame18, _, "$parentAlertsAndPopupsAnchor", "alertsAndPopupsAnchor", "Other Settings:", "GameFontNormal") @@ -2437,7 +2437,7 @@ function window:CreateFrame18() _detalhes:SendOptionsModifiedEvent (DetailsOptionsWindow.instance) end - window:CreateLineBackground2 (frame18, "DisableMythicDungeonSlider", "DisableMythicDungeonLabel", "Threat mythic dungeon as a normal dungeon: no trash merge, no mythic run overall segment.") + window:CreateLineBackground2 (frame18, "DisableMythicDungeonSlider", "DisableMythicDungeonLabel", "Threat mythic dungeon segments as common segments: no trash merge, no mythic run overall, segments wraps on entering and leaving combat.") --> clear cache g:NewLabel (frame18, _, "$parentClearCacheLabel", "ClearCacheLabel", "Clear Cache on New Event", "GameFontHighlightLeft") diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index 784777c1..981c75bf 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -6412,9 +6412,11 @@ local build_segment_list = function (self, elapsed) CoolTip:AddLine (Loc ["STRING_SEGMENT_START"] .. ":", thisCombat.data_inicio, 2, "white", "white") CoolTip:AddLine (Loc ["STRING_SEGMENT_END"] .. ":", thisCombat.data_fim or "in progress", 2, "white", "white") - local backgroundImage = _detalhes:GetRaidIcon (trashInfo.MapID, trashInfo.EJID, "party") - if (backgroundImage) then - CoolTip:SetWallpaper (2, backgroundImage, {0.070, 0.695, 0.087, 0.566}, {1, 1, 1, 0.5}, true) + if (trashInfo) then + local backgroundImage = _detalhes:GetRaidIcon (trashInfo.MapID, trashInfo.EJID, "party") + if (backgroundImage) then + CoolTip:SetWallpaper (2, backgroundImage, {0.070, 0.695, 0.087, 0.566}, {1, 1, 1, 0.5}, true) + end end end diff --git a/images/icons2.blp b/images/icons2.blp index 5168909a..a6f1feb7 100644 Binary files a/images/icons2.blp and b/images/icons2.blp differ diff --git a/startup.lua b/startup.lua index da09819d..c5d46a01 100644 --- a/startup.lua +++ b/startup.lua @@ -1245,7 +1245,7 @@ function _G._detalhes:Start() --> send feedback panel if the user got 100 or more logons with details if (self.tutorial.logons > 100) then -- and self.tutorial.logons < 104 - if (not self.tutorial.feedback_window1) then + if (not self.tutorial.feedback_window1 and not _detalhes.streamer_config.no_alerts) then --> check if isn't inside an instance if (_detalhes:IsInCity()) then self.tutorial.feedback_window1 = true @@ -1253,7 +1253,7 @@ function _G._detalhes:Start() end end end - + --> check is this is the first run of this version if (self.is_version_first_run) then @@ -1270,6 +1270,55 @@ function _G._detalhes:Start() _detalhes:FillUserCustomSpells() _detalhes:AddDefaultCustomDisplays() + --> show streamer update panel + --[ + if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 127 and enable_reset_warning) then + if (not _detalhes:GetTutorialCVar ("STREAMER_FEATURES_POPUP1")) then + _detalhes:SetTutorialCVar ("STREAMER_FEATURES_POPUP1", true) + + local f = CreateFrame ("frame", "DetailsContentCreatorsAlert", UIParent) + tinsert (UISpecialFrames, "DetailsContentCreatorsAlert") + f:SetPoint ("center") + f:SetSize (785, 516) + local bg = f:CreateTexture (nil, "background") + bg:SetPoint ("center", f, "center") + bg:SetTexture ([[Interface\GLUES\AccountUpgrade\upgrade-texture.blp]]) + bg:SetTexCoord (0/1024, 785/1024, 192/1024, 708/1024) + bg:SetSize (785, 516) + C_Timer.After (1, function ()f:Show()end) + + local logo = f:CreateTexture (nil, "artwork") + logo:SetPoint ("topleft", f, "topleft", 40, -60) + logo:SetTexture ([[Interface\Addons\Details\images\logotipo]]) + logo:SetTexCoord (0.07421875, 0.73828125, 0.51953125, 0.890625) + logo:SetWidth (186*1.2) + logo:SetHeight (50*1.2) + + local title = f:CreateFontString (nil, "overlay", "GameFontNormal") + title:SetPoint ("topleft", f, "topleft", 120, -160) + title:SetText ("Updates For Youtubers and Streamers") + _detalhes.gump:SetFontSize (title, 16) + + local text1 = f:CreateFontString (nil, "overlay", "GameFontNormal") + text1:SetPoint ("topleft", f, "topleft", 60, -210) + text1:SetText ("Yeah, another popup window, but it's for a good cause: has been added new features for content creators, check it out at the options panel > Streamer Settings, thank you!") + text1:SetSize (400, 200) + text1:SetJustifyV ("top") + text1:SetJustifyH ("left") + + local ipad = f:CreateTexture (nil, "overlay") + ipad:SetTexture ([[Interface\Addons\Details\images\icons2]]) + ipad:SetSize (130, 89) + ipad:SetPoint ("topleft", bg, "topleft", 474, -279) + ipad:SetTexCoord (110/512, 240/512, 163/512, 251/512) + + local closebutton = _detalhes.gump:CreateButton (f, function() f:Hide() end, 100, 24, "CLOSE") + closebutton:SetPoint ("topleft", bg, "topleft", 400, -405) + closebutton:InstallCustomTexture() + end + end + --]] + --> erase the custom for damage taken by spell if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 75 and enable_reset_warning) then if (_detalhes.global_plugin_database and _detalhes.global_plugin_database ["DETAILS_PLUGIN_ENCOUNTER_DETAILS"]) then @@ -1290,7 +1339,6 @@ function _G._detalhes:Start() end if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 73 and enable_reset_warning) then - local secure_func = function() for i = #_detalhes.custom, 1, -1 do local index = i @@ -1311,7 +1359,6 @@ function _G._detalhes:Start() end end pcall (secure_func) - end if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 70 and enable_reset_warning) then