diff --git a/boot.lua b/boot.lua index 2ee59735..1348efe0 100644 --- a/boot.lua +++ b/boot.lua @@ -4,7 +4,7 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") _detalhes.build_counter = 1601 --it's 1601 for release - _detalhes.userversion = "v4.0c" + _detalhes.userversion = "v4.0d" _detalhes.realversion = 75 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" Details = _detalhes @@ -30,6 +30,8 @@ do |cFFFFFF00-|r Fixed some issues on the Player Detail Window.\n\n |cFFFFFF00-|r Healing for battleground enemies is now placed on healing done instead of enemy healing done.\n\n +|cFFFFFF00-|r Fixed encounter time on title bar text.\n\n + |cFFFFFF00-|r Solo Plugins now has a close button on their panels.\n\n |cFFFFFF00-|r Added a custom display for Crowd Control Received.\n\n |cFFFFFF00-|r Weak Aura Creator Tool, now has full support for BigWigs and Dbm time bars.\n\n @@ -43,7 +45,7 @@ do -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v4.0c (|cFFFFCC00Set 08, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a custom display for Crowd Control Received.\n\n|cFFFFFF00-|r Weak Aura Creator Tool, now has full support for BigWigs and Dbm time bars.\n\n|cFFFFFF00-|r Auras for interrupt and dispelling has been added on the Weak Aura Creator Tool.\n\n|cFFFFFF00-|r Details! Forge now has support for DBM and BigWigs time bars.\n\n|cFFFFFF00-|r Solo Plugins now has a close button on their panels.\n\n|cFFFFFF00-|r Fixed damage/healing score message after a boss kill.\n\n|cFFFFFF00-|r Now, an alert to open the history panel is shown after killing a boss.\n\n|cFFFFFF00-|r Added a 'all-displays' menu when right clicking title bar.\n\n|cFFFFFF00-|r Removed few texture from bookmarks panel, now it has a more clean appearance.\n\n|cFFFFFF00-|r Updated Details! Framework.\n\n|cFFFFFF00-|r Added option in order to change the bar orientation.\n\n|cFFFFFF00-|r Added an option to make the menus on title bar work with clicks instead of hovering over them.\n\n|cFFFFFF00-|r Healing for battleground enemies is now placed on healing done instead of enemy healing done.\n\n|cFFFFFF00-|r Improvements on our support for Arena battles.\n\n|cFFFFFF00-|r Fixed some issues on the Player Detail Window.\n\n|cFFFFFF00-|r Fixed death display tooltip, wasn't respecting the font and size set on options panel.\n\n|cFFFFFF00v3.18.5 (|cFFFFCC00Aug 19, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Improvements on Weakauras creation from Encounter Details plugin.\n\n|cFFFFFF00-|r Improvements on 'Auto Switch to Current' feature. Details! windows are now more responsible about auto changing a segment while the player, for instance, has the report window opened.\n\n|cFFFFFF00-|r Added slash command '/de wipe'. It ends the raid encounter segment and stop capturing data.\nIf you are the raid leader, all other users of Details! will also stop.\nWorks great for players not make damage padding after a wipe call.\n\n|cFFFFFF00-|r Added the overheal made by pets on tooltip and player details window.\n\n|cFFFFFF00-|r Added an option to disable stretch button and bar highlight.\n\n|cFFFFFF00-|r Disabling nicknames now also disable avatars.\n\n|cFFFFFF00-|r Added 'spinal healing injector' on custom display 'Health Potion & Stone' used.\n\n|cFFFFFF00-|r Fixed title text width when auto-hide menu buttons is enabled.\n\n|cFFFFFF00-|r Fixed item level of timewarped items.\n\n|cFFFFFF00-|r Fixed report for custom display Crowd Control.\n\n|cFFFFFF00-|r Fixed role icons on custom displays.\n\n|cFFFFFF00-|r Fixed an issue with dropdown boxes where wasn't showing all options.\n\n|cFFFFFF00-|r Fixed Ticket #53: background alpha after stretching which wasn't correctly coming back to original color.\n\n|cFFFFFF00-|r Fixed ticket #51: API Call 'GetCombat('overall')' wasn't returning the overall combat object.\n\n|cFFFFFF00-|r Fixed ticket #50: issue opening icon selection frame.\n\n|cFFFFFF00v3.17.12 (|cFFFFCC00Aug 05, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for lock micro displays. When locked they don't interact with mouse or stay on top of menus.\n\n|cFFFFFF00-|r Fixed ticket #49: death display not working correctly with sort direction bottom-to-top.\n\n|cFFFFFF00-|r Fixed an issue with death display where the text wasn't updating their width correctly.\n\n|cFFFFFF00-|r Fixed an issue with energy and miscellaneous displays type not working correctly with bar animations.\n\n|cFFFFFF00-|r Fixed an issue while loading old profiles wans't updating their values for newer versions of the addon.\n\n|cFFFFFF00-|r Fixed an issue with bookmarks panel not opening correctly.\n\n|cFFFFFF00v3.17.10 (|cFFFFCC00Aug 02, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed ticket #47: Title bar font resets with UI reload / relog.\n\n|cFFFFFF00-|r Fixed ticket #46: Icon select panel wasn't opening.\n\n|cFFFFFF00-|r Fixed ticket #45: Windwalker icon for Mistweaver monks.\n\n|cFFFFFF00-|r Fixed issue with vehicles exchanging ownership, e.g. Soulbound Constructor on HFC raid.\n\n|cFFFFFF00v3.17.6 (|cFFFFCC00Jul 16, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Major improvements on the aura tool creation for WeakAuras.\n\n|cFFFFFF00-|r Fixed some issues with spec icons where sometimes it shows four small icons.\n\n|cFFFFFF00-|r Added an option to show a stopwatch on the title text showing the elapsed time of an encounter.\n\n|cFFFFFF00-|r Window title text now shrinks correctly when isn't enough space for it.\n\n|cFFFFFF00-|r For some special cases, left click now open the report window and shift+click shows the tooltip content in the window.\n\n|cFFFFFF00-|r Damage Taken by Spells now are a part of Damage bracket (no more on custom).\n\n|cFFFFFF00-|r Fixed custom functions for the customized bar left text.\n\n|cFFFFFF00-|r Improvements on report text format and also reverse option now works as intended.\n\n|cFFFFFF00-|r Removed the option for report only what is shown in the window.\n\n|cFFFFFF00-|r Added skins for report panel, the skin follow the skin selected for Player Detail Window.\n\n|cFFFFFF00v3.16.0c (|cFFFFCC00Jul 06, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with Encounter Details graphic for Archimonde encounter.\n\n|cFFFFFF00-|r Numbers format on Player Detail Window now respect the format chosen on options panel.\n\n|cFFFFFF00-|r Removed pet icons on Player Detail Window.\n\n|cFFFFFF00-|r Fixed some wrong textures on spec icons.\n\n|cFFFFFF00-|r Improvements on all skins for the Player Detail Window.\n\n|cFFFFFF00v3.15.8b (|cFFFFCC00Jul 01, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Soul Capacitor trinket fix.\n\n|cFFFFFF00-|r Fixed several small bugs from 6.2 patch.\n\n|cFFFFFF00-|r Disabled the special behavior for Tyrant Velhari encounter.\n\n|cFFFFFF00v3.15.7 (|cFFFFCC00Jun 23, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added support for Hellfire Citadel raid.\n\n|cFFFFFF00-|r Added support for custom CLEU parser functions.\n\n|cFFFFFF00-|r Tyrant Velhari encounter now has a custom CLEU parser function for healing where the heal absorbed by Aura of Contempt will count towards overheal and not healing done.\n\n|cFFFFFF00-|r Added support for embed on Chat Tabs.\n\n|cFFFFFF00-|r |cFFAAFFAAPS: We've made an addon for Shadow-Lord Iskar encounter called 'Iskar Assist' check it out|r.\n\n|cFFFFFF00v3.15.5a (|cFFFFCC00Jun 12, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue where sometimes tooltips wasn't being shown.\n\n|cFFFFFF00-|r Fixed a problem with overall data where it was using, even on dungoens, the raid-only 30 delay rule.\n\n|cFFFFFF00-|r Fixed an issue with spec detection (now it may detect even faster).\n\n|cFFFFFF00v3.15.5 (|cFFFFCC00Jun 09, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a problem with auto hide feature not hiding plugins hosted by the window.\n\n|cFFFFFF00-|r Fixed an issue with stretch feature when the anchor button was anchored at the bottom side of the window.\n\n|cFFFFFF00-|r Small interface tweaks on tooltips, bookmark and player detail window.\n\n|cFFFFFF00-|r Custom display 'My Spells' now also show amount of casts and uptime.\n\n|cFFFFFF00-|r Added an extra tooltip for the class icon at the player's bar.\n\n|cFFFFFF00-|r Activity time now has only 3 seconds inactivity tolerance on battlegrounds and arenas.\n\n|cFFFFFF00-|r Effective time will automatically be used when inside a battleground and using sync from the score board." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v4.d (|cFFFFCC00Set 09, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added a custom display for Crowd Control Received.\n\n|cFFFFFF00-|r Weak Aura Creator Tool, now has full support for BigWigs and Dbm time bars.\n\n|cFFFFFF00-|r Auras for interrupt and dispelling has been added on the Weak Aura Creator Tool.\n\n|cFFFFFF00-|r Details! Forge now has support for DBM and BigWigs time bars.\n\n|cFFFFFF00-|r Solo Plugins now has a close button on their panels.\n\n|cFFFFFF00-|r Fixed damage/healing score message after a boss kill.\n\n|cFFFFFF00-|r Now, an alert to open the history panel is shown after killing a boss.\n\n|cFFFFFF00-|r Added a 'all-displays' menu when right clicking title bar.\n\n|cFFFFFF00-|r Removed few texture from bookmarks panel, now it has a more clean appearance.\n\n|cFFFFFF00-|r Updated Details! Framework.\n\n|cFFFFFF00-|r Added option in order to change the bar orientation.\n\n|cFFFFFF00-|r Added an option to make the menus on title bar work with clicks instead of hovering over them.\n\n|cFFFFFF00-|r Healing for battleground enemies is now placed on healing done instead of enemy healing done.\n\n|cFFFFFF00-|r Improvements on our support for Arena battles.\n\n|cFFFFFF00-|r Fixed some issues on the Player Detail Window.\n\n|cFFFFFF00-|r Fixed encounter time on title bar text.\n\n|cFFFFFF00-|r Fixed death display tooltip, wasn't respecting the font and size set on options panel.\n\n|cFFFFFF00v3.18.5 (|cFFFFCC00Aug 19, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Improvements on Weakauras creation from Encounter Details plugin.\n\n|cFFFFFF00-|r Improvements on 'Auto Switch to Current' feature. Details! windows are now more responsible about auto changing a segment while the player, for instance, has the report window opened.\n\n|cFFFFFF00-|r Added slash command '/de wipe'. It ends the raid encounter segment and stop capturing data.\nIf you are the raid leader, all other users of Details! will also stop.\nWorks great for players not make damage padding after a wipe call.\n\n|cFFFFFF00-|r Added the overheal made by pets on tooltip and player details window.\n\n|cFFFFFF00-|r Added an option to disable stretch button and bar highlight.\n\n|cFFFFFF00-|r Disabling nicknames now also disable avatars.\n\n|cFFFFFF00-|r Added 'spinal healing injector' on custom display 'Health Potion & Stone' used.\n\n|cFFFFFF00-|r Fixed title text width when auto-hide menu buttons is enabled.\n\n|cFFFFFF00-|r Fixed item level of timewarped items.\n\n|cFFFFFF00-|r Fixed report for custom display Crowd Control.\n\n|cFFFFFF00-|r Fixed role icons on custom displays.\n\n|cFFFFFF00-|r Fixed an issue with dropdown boxes where wasn't showing all options.\n\n|cFFFFFF00-|r Fixed Ticket #53: background alpha after stretching which wasn't correctly coming back to original color.\n\n|cFFFFFF00-|r Fixed ticket #51: API Call 'GetCombat('overall')' wasn't returning the overall combat object.\n\n|cFFFFFF00-|r Fixed ticket #50: issue opening icon selection frame.\n\n|cFFFFFF00v3.17.12 (|cFFFFCC00Aug 05, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added an option for lock micro displays. When locked they don't interact with mouse or stay on top of menus.\n\n|cFFFFFF00-|r Fixed ticket #49: death display not working correctly with sort direction bottom-to-top.\n\n|cFFFFFF00-|r Fixed an issue with death display where the text wasn't updating their width correctly.\n\n|cFFFFFF00-|r Fixed an issue with energy and miscellaneous displays type not working correctly with bar animations.\n\n|cFFFFFF00-|r Fixed an issue while loading old profiles wans't updating their values for newer versions of the addon.\n\n|cFFFFFF00-|r Fixed an issue with bookmarks panel not opening correctly.\n\n|cFFFFFF00v3.17.10 (|cFFFFCC00Aug 02, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed ticket #47: Title bar font resets with UI reload / relog.\n\n|cFFFFFF00-|r Fixed ticket #46: Icon select panel wasn't opening.\n\n|cFFFFFF00-|r Fixed ticket #45: Windwalker icon for Mistweaver monks.\n\n|cFFFFFF00-|r Fixed issue with vehicles exchanging ownership, e.g. Soulbound Constructor on HFC raid.\n\n|cFFFFFF00v3.17.6 (|cFFFFCC00Jul 16, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Major improvements on the aura tool creation for WeakAuras.\n\n|cFFFFFF00-|r Fixed some issues with spec icons where sometimes it shows four small icons.\n\n|cFFFFFF00-|r Added an option to show a stopwatch on the title text showing the elapsed time of an encounter.\n\n|cFFFFFF00-|r Window title text now shrinks correctly when isn't enough space for it.\n\n|cFFFFFF00-|r For some special cases, left click now open the report window and shift+click shows the tooltip content in the window.\n\n|cFFFFFF00-|r Damage Taken by Spells now are a part of Damage bracket (no more on custom).\n\n|cFFFFFF00-|r Fixed custom functions for the customized bar left text.\n\n|cFFFFFF00-|r Improvements on report text format and also reverse option now works as intended.\n\n|cFFFFFF00-|r Removed the option for report only what is shown in the window.\n\n|cFFFFFF00-|r Added skins for report panel, the skin follow the skin selected for Player Detail Window.\n\n|cFFFFFF00v3.16.0c (|cFFFFCC00Jul 06, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue with Encounter Details graphic for Archimonde encounter.\n\n|cFFFFFF00-|r Numbers format on Player Detail Window now respect the format chosen on options panel.\n\n|cFFFFFF00-|r Removed pet icons on Player Detail Window.\n\n|cFFFFFF00-|r Fixed some wrong textures on spec icons.\n\n|cFFFFFF00-|r Improvements on all skins for the Player Detail Window.\n\n|cFFFFFF00v3.15.8b (|cFFFFCC00Jul 01, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Soul Capacitor trinket fix.\n\n|cFFFFFF00-|r Fixed several small bugs from 6.2 patch.\n\n|cFFFFFF00-|r Disabled the special behavior for Tyrant Velhari encounter.\n\n|cFFFFFF00v3.15.7 (|cFFFFCC00Jun 23, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added support for Hellfire Citadel raid.\n\n|cFFFFFF00-|r Added support for custom CLEU parser functions.\n\n|cFFFFFF00-|r Tyrant Velhari encounter now has a custom CLEU parser function for healing where the heal absorbed by Aura of Contempt will count towards overheal and not healing done.\n\n|cFFFFFF00-|r Added support for embed on Chat Tabs.\n\n|cFFFFFF00-|r |cFFAAFFAAPS: We've made an addon for Shadow-Lord Iskar encounter called 'Iskar Assist' check it out|r.\n\n|cFFFFFF00v3.15.5a (|cFFFFCC00Jun 12, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed an issue where sometimes tooltips wasn't being shown.\n\n|cFFFFFF00-|r Fixed a problem with overall data where it was using, even on dungoens, the raid-only 30 delay rule.\n\n|cFFFFFF00-|r Fixed an issue with spec detection (now it may detect even faster).\n\n|cFFFFFF00v3.15.5 (|cFFFFCC00Jun 09, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a problem with auto hide feature not hiding plugins hosted by the window.\n\n|cFFFFFF00-|r Fixed an issue with stretch feature when the anchor button was anchored at the bottom side of the window." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/core/gears.lua b/core/gears.lua index 57b5acd9..331f48f8 100644 --- a/core/gears.lua +++ b/core/gears.lua @@ -900,9 +900,11 @@ function _detalhes:StoreEncounter (combat) end if (match < raid_size * 0.75) then + print ("|cFFFFFF00Details! Storage|r: can't save the encounter, need at least 75% of players be from your guild.") return end else + print ("|cFFFFFF00Details! Storage|r: can't save the encounter, need at least 75% of players be from your guild.") return end @@ -910,6 +912,7 @@ function _detalhes:StoreEncounter (combat) if (not IsAddOnLoaded ("Details_DataStorage")) then local loaded, reason = LoadAddOn ("Details_DataStorage") if (not loaded) then + print ("|cFFFFFF00Details! Storage|r: can't save the encounter, couldn't load DataStorage, may be the addon is disabled.") return end end @@ -1022,7 +1025,7 @@ function _detalhes:StoreEncounter (combat) local raid_name = GetInstanceInfo() local func = {_detalhes.OpenRaidHistoryWindow, _detalhes, raid_name, encounter_id, diff, my_role, guildName, 2, UnitName ("player")} local icon = {[[Interface\AddOns\Details\images\icons]], 16, 16, false, 434/512, 466/512, 243/512, 273/512} - instance:InstanceAlert ("Boss Defeated, Open History! ", icon, 40, func) + instance:InstanceAlert ("Boss Defeated, Open History! ", icon, 40, func, true) end end end diff --git a/core/parser.lua b/core/parser.lua index a77c22e7..a024c75b 100644 --- a/core/parser.lua +++ b/core/parser.lua @@ -145,6 +145,9 @@ end -- /run local f=CreateFrame("frame");f:RegisterAllEvents();f:SetScript("OnEvent", function(self, ...)print (...);end) +-- /run +-- local f=CreateFrame("frame");f:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");f:SetScript("OnEvent", function(self, ...) print (...) end) + -- /run local f=CreateFrame("frame");f:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED");f:SetScript("OnEvent", function(self, ...)print (...);end) -- /run local f=CreateFrame("frame");f:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED");f:SetScript("OnEvent",function(self, ...) local a = select(6, ...);if (a=="")then print (...) end end) diff --git a/core/windows.lua b/core/windows.lua index 513c1dc8..fcfb8649 100644 --- a/core/windows.lua +++ b/core/windows.lua @@ -1202,6 +1202,7 @@ --> select player: local on_player2_select = function (_, _, player) + f.latest_player_selected = player f:BuildPlayerTable (player) end local build_player2_list = function() @@ -1332,7 +1333,7 @@ local player = roleTable [playerName] if (player) then - tinsert (data, {text = date, value = player[1], data = player, fulldate = encounter.date}) + tinsert (data, {text = date, value = player[1], data = player, fulldate = encounter.date, elapsed = encounter.elapsed}) end end end @@ -1346,10 +1347,23 @@ local onenter = function (self) GameCooltip:Reset() + GameCooltip:SetType ("tooltip") + + GameCooltip:SetOption ("TextSize", _detalhes.tooltip.fontsize) + GameCooltip:SetOption ("TextFont", _detalhes.tooltip.fontface) + GameCooltip:SetOption ("TextColor", _detalhes.tooltip.fontcolor) + GameCooltip:SetOption ("TextColorRight", _detalhes.tooltip.fontcolor_right) + GameCooltip:SetOption ("TextShadow", _detalhes.tooltip.fontshadow and "OUTLINE") + + GameCooltip:SetOption ("LeftBorderSize", -5) + GameCooltip:SetOption ("RightBorderSize", 5) + GameCooltip:SetOption ("MinWidth", 175) + GameCooltip:SetOption ("StatusBarTexture", [[Interface\AddOns\Details\images\bar_background]]) GameCooltip:AddLine ("Total Done:", _detalhes:ToK2 (self.data.value)) + GameCooltip:AddLine ("Dps:", _detalhes:ToK2 (self.data.value / self.data.elapsed)) GameCooltip:AddLine ("Item Level:", floor (self.data.data [2])) - GameCooltip:AddLine ("Date:", self.data.fulldate) + GameCooltip:AddLine ("Date:", self.data.fulldate:gsub (".*%s", "")) GameCooltip:SetWallpaper (1, [[Interface\SPELLBOOK\Spellbook-Page-1]], menu_wallpaper_tex, menu_wallpaper_color, true) GameCooltip:SetBackdrop (1, _detalhes.tooltip_backdrop, cooltip_block_bg, _detalhes.tooltip_border_color) @@ -1467,11 +1481,15 @@ player2_dropdown:Show() f.build_player2_data = {encounters, guild, role} player2_dropdown:Refresh() + + player_name = f.latest_player_selected or player_name + if (player_name) then player2_dropdown:Select (player_name) else player2_dropdown:Select (1, true) end + f:BuildPlayerTable (player2_dropdown.value) end else diff --git a/functions/slash.lua b/functions/slash.lua index 23560011..b7503397 100644 --- a/functions/slash.lua +++ b/functions/slash.lua @@ -1073,7 +1073,7 @@ function SlashCmdList.DETAILS (msg, editbox) local instance = _detalhes:GetInstance (lower_instance) if (instance) then local func = {_detalhes.OpenRaidHistoryWindow, _detalhes, "Hellfire Citadel", 1800, 15, "DAMAGER", "Rock Lobster", 2, "Keyspell"} - instance:InstanceAlert ("Boss Defeated, Open History! ", {[[Interface\AddOns\Details\images\icons]], 16, 16, false, 434/512, 466/512, 243/512, 273/512}, 40, func) + instance:InstanceAlert ("Boss Defeated, Open History! ", {[[Interface\AddOns\Details\images\icons]], 16, 16, false, 434/512, 466/512, 243/512, 273/512}, 40, func, true) end end diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index d9eed40a..f66596f7 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -2904,7 +2904,7 @@ local hide_click_func = function() --empty end -function _detalhes:InstanceAlert (msg, icon, time, clickfunc) +function _detalhes:InstanceAlert (msg, icon, time, clickfunc, doflash) if (not self.meu_id) then local lower = _detalhes:GetLowerInstanceNumber() @@ -2971,8 +2971,17 @@ function _detalhes:InstanceAlert (msg, icon, time, clickfunc) self.alert:SetPoint ("left", self.baseframe, "left", 3, 0) self.alert:SetPoint ("right", self.baseframe, "right", -3, 0) + self.alert:SetFrameStrata ("TOOLTIP") + self.alert.button:SetFrameStrata ("TOOLTIP") + self.alert:Show() + + if (doflash) then + self.alert:DoFlash() + end + self.alert:Play() + end local alert_on_click = function (self, button) @@ -2985,7 +2994,7 @@ local alert_on_click = function (self, button) self:GetParent():Hide() end -function CreateAlertFrame (baseframe, instancia) +local function CreateAlertFrame (baseframe, instancia) local frame_upper = CreateFrame ("scrollframe", "DetailsAlertFrameScroll" .. instancia.meu_id, baseframe) frame_upper:SetPoint ("bottom", baseframe, "bottom") @@ -3024,7 +3033,7 @@ function CreateAlertFrame (baseframe, instancia) local text = alert_bg:CreateFontString (nil, "overlay", "GameFontNormal") text:SetPoint ("right", alert_bg, "right", -14, 0) _detalhes:SetFontSize (text, 10) - text:SetTextColor (1, 1, 1, 1) + text:SetTextColor (1, 1, 1, 0.8) local rotate_frame = CreateFrame ("frame", "DetailsAlertFrameRotate" .. instancia.meu_id, alert_bg) rotate_frame:SetWidth (12) @@ -3044,8 +3053,6 @@ function CreateAlertFrame (baseframe, instancia) button._instance = instancia button.func_param = {} - --local button = gump:NewButton (alert_bg, nil, "DetailsInstance"..instancia.meu_id.."AlertButton", nil, 1, 1) - local RotateAnimGroup = rotate_frame:CreateAnimationGroup() local rotate = RotateAnimGroup:CreateAnimation ("Rotation") rotate:SetDegrees (360) @@ -3057,7 +3064,6 @@ function CreateAlertFrame (baseframe, instancia) local anime = alert_bg:CreateAnimationGroup() anime.group = anime:CreateAnimation ("Translation") anime.group:SetDuration (0.15) - --anime.group:SetSmoothing ("OUT") anime.group:SetOffset (0, 10) anime:SetScript ("OnFinished", function(self) alert_bg:Show() @@ -3066,10 +3072,50 @@ function CreateAlertFrame (baseframe, instancia) alert_bg:SetPoint ("right", baseframe, "right", -3, 0) end) + local on_enter_alert = function (self) + text:SetTextColor (1, 0.8, 0.3, 1) + icon:SetBlendMode ("ADD") + end + local on_leave_alert = function (self) + text:SetTextColor (1, 1, 1, 0.8) + icon:SetBlendMode ("BLEND") + end + + button:SetScript ("OnEnter", on_enter_alert) + button:SetScript ("OnLeave", on_leave_alert) + function alert_bg:Play() anime:Play() end + local flash_texture = button:CreateTexture (nil, "overlay") + flash_texture:SetTexCoord (53/512, 347/512, 58/256, 120/256) + flash_texture:SetTexture ([[Interface\AchievementFrame\UI-Achievement-Alert-Glow]]) + flash_texture:SetAllPoints() + flash_texture:SetBlendMode ("ADD") + local animation = flash_texture:CreateAnimationGroup() + local anim1 = animation:CreateAnimation ("ALPHA") + local anim2 = animation:CreateAnimation ("ALPHA") + anim1:SetOrder (1) + anim1:SetChange (1) + anim1:SetDuration (0.1) + anim2:SetOrder (2) + anim2:SetChange (-1) + anim2:SetDuration (0.2) + animation:SetScript ("OnFinished", function (self) + flash_texture:Hide() + end) + flash_texture:Hide() + + local do_flash = function() + flash_texture:Show() + animation:Play() + end + + function alert_bg:DoFlash() + C_Timer.After (0.23, do_flash) + end + alert_bg.text = text alert_bg.icon = icon alert_bg.button = button @@ -6517,8 +6563,7 @@ end function _detalhes:CheckForTextTimeCounter (combat_start) if (combat_start) then - local combat = _detalhes.tabela_vigente - if (combat.is_boss) then + if (_detalhes.tabela_vigente.is_boss) then local lower = _detalhes:GetLowerInstanceNumber() if (lower) then local instance = _detalhes:GetInstance (lower) @@ -6533,6 +6578,10 @@ function _detalhes:CheckForTextTimeCounter (combat_start) else return end + else + if (_detalhes.in_combat and _detalhes.zone_type == "raid") then + _detalhes:ScheduleTimer ("CheckForTextTimeCounter", 3, true) + end end else for _, instance in ipairs (_detalhes.tabela_instancias) do diff --git a/gumps/switch.lua b/gumps/switch.lua index 999af7f9..309b754e 100644 --- a/gumps/switch.lua +++ b/gumps/switch.lua @@ -61,12 +61,14 @@ do frame.star = frame:CreateTexture (nil, "overlay") frame.star:SetTexture ([[Interface\Glues\CharacterSelect\Glues-AddOn-Icons]]) frame.star:SetTexCoord (0.75, 1, 0, 1) + frame.star:SetVertexColor (1, 0.8, 0.6) frame.star:SetSize (16, 16) frame.star:SetPoint ("bottomleft", frame, "topleft", 4, 1) frame.title_label = frame:CreateFontString (nil, "overlay", "GameFontNormal") frame.title_label:SetPoint ("left", frame.star, "right", 4, 0) - frame.title_label:SetText ("Bookmark") + frame.title_label:SetTextColor (1, 0.8, 0.4) + frame.title_label:SetText (Loc ["STRING_KEYBIND_BOOKMARK"]) --------------------------------------------------------------------------------------------------------------------------- diff --git a/images/toolbar_icons.tga b/images/toolbar_icons.tga index a92ddc09..d3f922d1 100644 Binary files a/images/toolbar_icons.tga and b/images/toolbar_icons.tga differ