diff --git a/boot.lua b/boot.lua index 703479f1..8f8535ac 100644 --- a/boot.lua +++ b/boot.lua @@ -3,8 +3,8 @@ _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 319 --it's 319 for release - _detalhes.userversion = "v3.6.14a" + _detalhes.build_counter = 340 --it's 340 for release + _detalhes.userversion = "v3.6.14b" _detalhes.realversion = 55 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -18,28 +18,21 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ - -|cFFFFFF00v3.6.14 (|cFFFFCC00Dec 29, 2014|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n -|cFFFFFF00-|r Added tooltip and support for healers on 'My Spells' display.\n\n -|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n -|cFFFFFF00-|r Fre improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n -|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n -|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n - -|cFFFFFF00v3.6.12 (|cFFFFCC00Dec 28, 2014|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Improvements for overkill amount.\n\n +|cFFFFFF00v3.6.14b (|cFFFFCC00Jan 01, 2015|r|cFFFFFF00)|r:\n\n |cFFFFFF00-|r Added custom display 'My Spells' which shows your spells in the window.\n\n - -|cFFFFFF00v3.6.11 (|cFFFFCC00Dec 28, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n - -|cFFFFFF00v3.6.10 (|cFFFFCC00Dec 27, 2014|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n +|cFFFFFF00-|r Added overkill on death's tooltip.\n\n +|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n +|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n +|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n +|cFFFFFF00-|r Few improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n |cFFFFFF00-|r Damage Taken by Spell won't show pets in its tooltip any more.\n\n |cFFFFFF00-|r Enemies display won't show any more mirror images and spirit link totems.\n\n |cFFFFFF00-|r Enemies's tooltip now only show players and show all players instead of only 6.\n\n -|cFFFFFF00-|r Added overkill on death's tooltip.\n\n -|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n |cFFFFFF00-|r Few cooldowns shown as raid wide now shows as personal cooldowns.\n\n +|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n +|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n +|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n |cFFFFFF00v3.6.7 (|cFFFFCC00Dec 24, 2014|r|cFFFFFF00)|r:\n\n |cFFFFFF00-|r Added Fast Dps/Hps Updates, enable in on Rows: Advanced -> Fast Updates.\n\n @@ -58,7 +51,7 @@ do |cFFFFFF00-|r Fixed bugs on sending messages to chat for Raid Tools.\n\n --]] - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.6.14 (|cFFFFCC00Dec 29, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n|cFFFFFF00-|r Added tooltip and support for healers on 'My Spells' display.\n\n|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n|cFFFFFF00-|r Few improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n|cFFFFFF00v3.6.12 (|cFFFFCC00Dec 28, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Improvements for overkill amount.\n\n|cFFFFFF00-|r Added custom display 'My Spells' which shows your spells in the window.\n\n|cFFFFFF00v3.6.11 (|cFFFFCC00Dec 28, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n|cFFFFFF00v3.6.10 (|cFFFFCC00Dec 27, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Damage Taken by Spell won't show pets in its tooltip any more.\n\n|cFFFFFF00-|r Enemies display won't show any more mirror images and spirit link totems.\n\n|cFFFFFF00-|r Enemies's tooltip now only show players and show all players instead of only 6.\n\n|cFFFFFF00-|r Added overkill on death's tooltip.\n\n|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n|cFFFFFF00-|r Few cooldowns shown as raid wide now shows as personal cooldowns.\n\n|cFFFFFF00v3.6.8 (|cFFFFCC00Dec 24, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Fast (i mean, really fast) Dps/Hps update rate, its option is under Rows: Advanced -> Fast Updates.\n\n|cFFFFFF00-|r Created a custom spell for Mirror Image's Fireball and Frostbolt, with that Player Detail window distinguishes spells from the player and images.\n\n|cFFFFFF00-|r Added new skin: 'ElvUI Style II'.\n\n|cFFFFFF00-|r Added Observer mode for Raid Tools: report cooldown/interrupt/death of entire raid only to you in your chat window.\n\n|cFFFFFF00-|r Added new plugin 'Raid Check': tracks raid members checking food, flask and pre-potions usage.\n\n|cFFFFFF00-|r Changed DPS display, now it shows onyl the player's Dps and the Dps difference between him and the top ranked.\n\n|cFFFFFF00-|r Changed Overheal display, now its percentage shows the player's overheal percent.\n\n|cFFFFFF00-|r Player Detail Window now shows the amount of multistrike on normal and critical hits.\n\n|cFFFFFF00-|r Removed skin: 'ElvUI Frame Style BW'.\n\n|cFFFFFF00-|r The tooltip for Scale option under options panel, now shows the real value for the scale.\n\n|cFFFFFF00-|r Fixed Imperator Mar'gok's adds damage taken.\n\n|cFFFFFF00-|r Fixed a problem where multistrike was counting towards critical strike amount.\n\n|cFFFFFF00-|r Fixed death display's report where it was't showing any death.\n\n|cFFFFFF00-|r Fixed a small issue with Encounter Details plugin where sometimes gets a error right after a boss encounter.\n\n|cFFFFFF00-|r Fixed bugs on sending messages to chat for Raid Tools.\n\n\n\n|cFFFFFF00v3.5.1 (|cFFFFCC00Dec 16, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed few accuracy on miss spells.\n\n|cFFFFFF00v3.5.0 (|cFFFFCC00Dec 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed tooltip for Auras and Voidzones, now shows sorted by damage and time.\n\n|cFFFFFF00-|r More fixes for Korgath encounter on Highmaul.\n\n|cFFFFFF00-|r Added slash commands: 'reset' 'config'.\n\n|cFFFFFF00-|r Spell bars on Player Details Window now is painted with the spell spellschool color.\n\n|cFFFFFF00-|r Multistrike doesn't count any more for spell's Minimal Damage.\n\n|cFFFFFF00-|r Resource display got an tooltip which shows what resource is and resource gained per minute.\n\n|cFFFFFF00-|r Clicking on report button when the report window is already open, make it close.\n\n|cFFFFFF00v3.4.7 (|cFFFFCC00Dec 11, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs plugin got updates on Endurance Player Value and few bug fixes.\n\n|cFFFFFF00-|r Max Window Amount options can new be set to 1, before the minimum was 3.\n\n|cFFFFFF00-|r Fixed a problem with friendly fire tooltip where sometimes it wasn't showing up.\n\n|cFFFFFF00-|r Fixed cooldowns tooltip which wasn't showing rounded numbers (49.99 instead of 50).\n\n|cFFFFFF00-|r Fixed Warrior's Shield Block which wasn't being count as a cooldown.\n\n|cFFFFFF00-|r Fixed a problem where sometimes when a hunter pull and reset the boss right after, was causing segments to merge.\n\n|cFFFFFF00v3.4.4 (|cFFFFCC00Dec 05, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a issue with Ko'Ragh boss on Highmaul raid.\n\n|cFFFFFF00-|r Few changes on Bookmark panel.\n\n|cFFFFFF00v3.4.3 (|cFFFFCC00Dec 02, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed 'Simple Gray' skin.\n\n|cFFFFFF00-|r Addde new skin: 'Forced Square'.\n\n|cFFFFFF00-|r 'Default Skin' got renamed to 'WoW Interface'.\n\n|cFFFFFF00v3.4.2 (|cFFFFCC00Dec 01, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a bug with menu desaturation where erase and close buttons stay colored after clicking on it.\n\n|cFFFFFF00-|r Fixed stretch where sometimes after release the window, all exceeded bars shows up and fade in again.\n\n|cFFFFFF00-|r Fixed a bug with the +- buttons on the window's scale option.\n\n|cFFFFFF00-|r Fixed the border for sub menus on mode menu.\n\n|cFFFFFF00v3.4.0 (|cFFFFCC00Nov 29, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed custom displays ignoring 'target' setted.\n\n|cFFFFFF00-|r Fixed plugins showing its icon even when auto hide menus is enabled.\n\n|cFFFFFF00-|r .Updates slash command 'worldboss' now it shows Draenor bosses.\n\n|cFFFFFF00v3.3.0 (|cFFFFCC00Nov 25, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 3D models for the bars in the window. The options are at Appearance -> Rows: Advanced.\n\n|cFFFFFF00-|r Now when showing custom displays, clicking on a bar report what is shown on bar's tooltip.\n\n|cFFFFFF00-|r More fixes for dungeon bosses identification.\n\n|cFFFFFF00-|r Fixed a tooltip bug with Debuff Uptime and Aura & Voidzone displays.\n\n|cFFFFFF00-|r Fixed Player Details Window for friendly fire and damage taken.\n\n|cFFFFFF00-|r Fixed Molten Core Raid Finder version where all bosses was considered trash segments.\n\n|cFFFFFF00v3.2.4 (|cFFFFCC00Nov 19, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r More fixes for dungeon bosses recognition.\n\n|cFFFFFF00-|r Fixes for few errors during combat parser.\n\n|cFFFFFF00v3.2.3 (|cFFFFCC00Nov 18, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed Monk's Stagger ability which was counting as damage done.\n\n|cFFFFFF00-|r Added WoD dungeon information, this fixes dungeon bosses being assigned as 'trash cleanup'.\n\n|cFFFFFF00-|r Added more information on API.txt document (is in Details! root folder).\n\n|cFFFFFF00v3.2.1 (|cFFFFCC00Nov 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Custom Displays updated to track WoD potions.\n\n|cFFFFFF00-|r Added Feedback panel at options panel." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.6.14b (|cFFFFCC00Jan 01, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added custom display 'My Spells' which shows your spells in the window.\n\n|cFFFFFF00-|r Added new custom display: Health Potion & Stone.\n\n|cFFFFFF00-|r Added overkill on death's tooltip.\n\n|cFFFFFF00-|r Created custom spells for Twin Ogron's Pulverize. Now it has 3 spells one for each wave.\n\n|cFFFFFF00-|r Created custom spells for Ko'ragh Overflowing Energy. Now it has 2 spells one for when the ball is catched and other when it reaches the ground and explodes.\n\n|cFFFFFF00-|r Changed healing multistrike to use the same format as damage done.\n\n|cFFFFFF00-|r Few improvements on Tiny Threat plugin: color gradient green-red is fixed, texts and bar texture now correctly uses the window settings.\n\n|cFFFFFF00-|r Damage Taken by Spell won't show pets in its tooltip any more.\n\n|cFFFFFF00-|r Enemies display won't show any more mirror images and spirit link totems.\n\n|cFFFFFF00-|r Enemies's tooltip now only show players and show all players instead of only 6.\n\n|cFFFFFF00-|r Few cooldowns shown as raid wide now shows as personal cooldowns.\n\n|cFFFFFF00-|r Fixed dispell tagets on dispell's tooltip.\n\n|cFFFFFF00-|r Fixed 'First Hit' raid tool.\n\n|cFFFFFF00-|r Fixed 'Open Options Panel' from interface panel.\n\n|cFFFFFF00v3.6.8 (|cFFFFCC00Dec 24, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added Fast (i mean, really fast) Dps/Hps update rate, its option is under Rows: Advanced -> Fast Updates.\n\n|cFFFFFF00-|r Created a custom spell for Mirror Image's Fireball and Frostbolt, with that Player Detail window distinguishes spells from the player and images.\n\n|cFFFFFF00-|r Added new skin: 'ElvUI Style II'.\n\n|cFFFFFF00-|r Added Observer mode for Raid Tools: report cooldown/interrupt/death of entire raid only to you in your chat window.\n\n|cFFFFFF00-|r Added new plugin 'Raid Check': tracks raid members checking food, flask and pre-potions usage.\n\n|cFFFFFF00-|r Changed DPS display, now it shows onyl the player's Dps and the Dps difference between him and the top ranked.\n\n|cFFFFFF00-|r Changed Overheal display, now its percentage shows the player's overheal percent.\n\n|cFFFFFF00-|r Player Detail Window now shows the amount of multistrike on normal and critical hits.\n\n|cFFFFFF00-|r Removed skin: 'ElvUI Frame Style BW'.\n\n|cFFFFFF00-|r The tooltip for Scale option under options panel, now shows the real value for the scale.\n\n|cFFFFFF00-|r Fixed Imperator Mar'gok's adds damage taken.\n\n|cFFFFFF00-|r Fixed a problem where multistrike was counting towards critical strike amount.\n\n|cFFFFFF00-|r Fixed death display's report where it was't showing any death.\n\n|cFFFFFF00-|r Fixed a small issue with Encounter Details plugin where sometimes gets a error right after a boss encounter.\n\n|cFFFFFF00-|r Fixed bugs on sending messages to chat for Raid Tools.\n\n\n\n|cFFFFFF00v3.5.1 (|cFFFFCC00Dec 16, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed few accuracy on miss spells.\n\n|cFFFFFF00v3.5.0 (|cFFFFCC00Dec 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed tooltip for Auras and Voidzones, now shows sorted by damage and time.\n\n|cFFFFFF00-|r More fixes for Korgath encounter on Highmaul.\n\n|cFFFFFF00-|r Added slash commands: 'reset' 'config'.\n\n|cFFFFFF00-|r Spell bars on Player Details Window now is painted with the spell spellschool color.\n\n|cFFFFFF00-|r Multistrike doesn't count any more for spell's Minimal Damage.\n\n|cFFFFFF00-|r Resource display got an tooltip which shows what resource is and resource gained per minute.\n\n|cFFFFFF00-|r Clicking on report button when the report window is already open, make it close.\n\n|cFFFFFF00v3.4.7 (|cFFFFCC00Dec 11, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Advanced Death Logs plugin got updates on Endurance Player Value and few bug fixes.\n\n|cFFFFFF00-|r Max Window Amount options can new be set to 1, before the minimum was 3.\n\n|cFFFFFF00-|r Fixed a problem with friendly fire tooltip where sometimes it wasn't showing up.\n\n|cFFFFFF00-|r Fixed cooldowns tooltip which wasn't showing rounded numbers (49.99 instead of 50).\n\n|cFFFFFF00-|r Fixed Warrior's Shield Block which wasn't being count as a cooldown.\n\n|cFFFFFF00-|r Fixed a problem where sometimes when a hunter pull and reset the boss right after, was causing segments to merge.\n\n|cFFFFFF00v3.4.4 (|cFFFFCC00Dec 05, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a issue with Ko'Ragh boss on Highmaul raid.\n\n|cFFFFFF00-|r Few changes on Bookmark panel.\n\n|cFFFFFF00v3.4.3 (|cFFFFCC00Dec 02, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Removed 'Simple Gray' skin.\n\n|cFFFFFF00-|r Addde new skin: 'Forced Square'.\n\n|cFFFFFF00-|r 'Default Skin' got renamed to 'WoW Interface'.\n\n|cFFFFFF00v3.4.2 (|cFFFFCC00Dec 01, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed a bug with menu desaturation where erase and close buttons stay colored after clicking on it.\n\n|cFFFFFF00-|r Fixed stretch where sometimes after release the window, all exceeded bars shows up and fade in again.\n\n|cFFFFFF00-|r Fixed a bug with the +- buttons on the window's scale option.\n\n|cFFFFFF00-|r Fixed the border for sub menus on mode menu.\n\n|cFFFFFF00v3.4.0 (|cFFFFCC00Nov 29, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed custom displays ignoring 'target' setted.\n\n|cFFFFFF00-|r Fixed plugins showing its icon even when auto hide menus is enabled.\n\n|cFFFFFF00-|r .Updates slash command 'worldboss' now it shows Draenor bosses.\n\n|cFFFFFF00v3.3.0 (|cFFFFCC00Nov 25, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Added 3D models for the bars in the window. The options are at Appearance -> Rows: Advanced.\n\n|cFFFFFF00-|r Now when showing custom displays, clicking on a bar report what is shown on bar's tooltip.\n\n|cFFFFFF00-|r More fixes for dungeon bosses identification.\n\n|cFFFFFF00-|r Fixed a tooltip bug with Debuff Uptime and Aura & Voidzone displays.\n\n|cFFFFFF00-|r Fixed Player Details Window for friendly fire and damage taken.\n\n|cFFFFFF00-|r Fixed Molten Core Raid Finder version where all bosses was considered trash segments.\n\n|cFFFFFF00v3.2.4 (|cFFFFCC00Nov 19, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r More fixes for dungeon bosses recognition.\n\n|cFFFFFF00-|r Fixes for few errors during combat parser.\n\n|cFFFFFF00v3.2.3 (|cFFFFCC00Nov 18, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Fixed Monk's Stagger ability which was counting as damage done.\n\n|cFFFFFF00-|r Added WoD dungeon information, this fixes dungeon bosses being assigned as 'trash cleanup'.\n\n|cFFFFFF00-|r Added more information on API.txt document (is in Details! root folder).\n\n|cFFFFFF00v3.2.1 (|cFFFFCC00Nov 14, 2014|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Custom Displays updated to track WoD potions.\n\n|cFFFFFF00-|r Added Feedback panel at options panel." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/core/windows.lua b/core/windows.lua index 1d9c15db..ed877fba 100644 --- a/core/windows.lua +++ b/core/windows.lua @@ -1075,113 +1075,6 @@ _G.DetailsBookmarkManager:Refresh() end ---> tutorial bubbles - do - --[1] criar nova instancia - --[2] esticar janela - --[3] resize e trava - --[4] shortcut frame - --[5] micro displays - --[6] snap windows - - function _detalhes:run_tutorial() - - local lower_instance = _detalhes:GetLowerInstanceNumber() - if (lower_instance) then - local instance = _detalhes:GetInstance (lower_instance) - - _detalhes.times_of_tutorial = _detalhes.times_of_tutorial + 1 - if (_detalhes.times_of_tutorial > 20) then - return - end - - if (_detalhes.MicroButtonAlert:IsShown()) then - return _detalhes:ScheduleTimer ("delay_tutorial", 2) - end - - if (not _detalhes.tutorial.alert_frames [1]) then - - _detalhes.MicroButtonAlert.Text:SetText (Loc ["STRING_MINITUTORIAL_1"]) - _detalhes.MicroButtonAlert:SetPoint ("bottom", instance.baseframe.cabecalho.novo, "top", 0, 16) - _detalhes.MicroButtonAlert:SetHeight (200) - _detalhes.MicroButtonAlert:Show() - _detalhes.tutorial.alert_frames [1] = true - - elseif (not _detalhes.tutorial.alert_frames [2]) then - - _detalhes.MicroButtonAlert.Text:SetText (Loc ["STRING_MINITUTORIAL_2"]) - _detalhes.MicroButtonAlert:SetPoint ("bottom", instance.baseframe.button_stretch, "top", 0, 15) - instance.baseframe.button_stretch:Show() - instance.baseframe.button_stretch:SetAlpha (1) - _detalhes.MicroButtonAlert:Show() - _detalhes.tutorial.alert_frames [2] = true - - elseif (not _detalhes.tutorial.alert_frames [3]) then - _detalhes.MicroButtonAlert.Text:SetText (Loc ["STRING_MINITUTORIAL_3"]) - _detalhes.MicroButtonAlert:SetPoint ("bottom", instance.baseframe.resize_direita, "top", -8, 16) - - _detalhes.OnEnterMainWindow (instance) - instance.baseframe.button_stretch:SetAlpha (0) - - _detalhes.MicroButtonAlert:Show() - _detalhes.tutorial.alert_frames [3] = true - - elseif (not _detalhes.tutorial.alert_frames [4]) then - - _detalhes.MicroButtonAlert.Text:SetText (Loc ["STRING_MINITUTORIAL_4"]) - _detalhes.MicroButtonAlert:SetPoint ("bottom", instance.baseframe, "center", 0, 16) - _detalhes.MicroButtonAlert:Show() - _detalhes.tutorial.alert_frames [4] = true - - elseif (not _detalhes.tutorial.alert_frames [5]) then - - _detalhes.MicroButtonAlert.Text:SetText (Loc ["STRING_MINITUTORIAL_5"]) - _detalhes.MicroButtonAlert:SetPoint ("bottom", instance.baseframe.rodape.top_bg, "top", 0, 16) - _detalhes.MicroButtonAlert:Show() - _detalhes.MicroButtonAlert:SetHeight (220) - _detalhes.tutorial.alert_frames [5] = true - - elseif (not _detalhes.tutorial.alert_frames [6]) then - - _detalhes.MicroButtonAlert.Text:SetText (Loc ["STRING_MINITUTORIAL_6"]) - _detalhes.MicroButtonAlert:SetPoint ("bottom", instance.baseframe.barra_direita, "center", -24, 16) - _detalhes.MicroButtonAlert:SetHeight (200) - _detalhes.MicroButtonAlert:Show() - _detalhes.tutorial.alert_frames [6] = true - - return --> colocando return pra nao rodar o schedule infinitamente - end - end - -- - _detalhes:ScheduleTimer ("delay_tutorial", 2) - end - - -- [1] criar nova instancia - -- [2] esticar janela - -- [3] resize e trava - -- [4] shortcut frame - -- [5] micro displays - -- [6] snap windows - - function _detalhes:delay_tutorial() - if (_detalhes.character_data.logons < 2) then - _detalhes:run_tutorial() - end - end - - function _detalhes:StartTutorial() - -- - if (_G ["DetailsWelcomeWindow"] and _G ["DetailsWelcomeWindow"]:IsShown()) then - return _detalhes:ScheduleTimer ("StartTutorial", 10) - end - -- - _detalhes.times_of_tutorial = 0 - _detalhes:ScheduleTimer ("delay_tutorial", 5) - end - - end - - --> create bubble do local f = CreateFrame ("frame", "DetailsBubble", UIParent) @@ -2290,7 +2183,7 @@ function _detalhes:CreateTestBars() local current_combat = _detalhes:GetCombat ("current") - local actors_name = {"Ragnaros", "The Lich King", "Your Neighbor", "Your Raid Leader", "Huffer", "Your Internet Girlfriend", "Mr. President", "A Shadow Priest Complaining About Dps", "Ms. Gray", "Parry Hotter", "Your Math Teacher", "King Djoffrey", UnitName ("player") .. " Snow", "A Drunk Dawrf", "Somebody That You Used To Know", "Low Dps Guy", "Helvis Phresley (Death Log Not Found)", "Stormwind Guard", "A PvP Player", "Bolvar Fordragon","Malygos","Akama","Anachronos","Lady Blaumeux","Cairne Bloodhoof","Borivar","C'Thun","Drek'Thar","Durotan","Eonar","Footman Malakai","Bolvar Fordragon","Fritz Fizzlesprocket","Lisa Gallywix","M'uru","High Priestess MacDonnell","Nazgrel","Ner'zhul","Saria Nightwatcher","Chief Ogg'ora","Ogoun","Grimm Onearm","Apothecary Oni'jus","Orman of Stromgarde","General Rajaxx","Baron Rivendare","Roland","Archmage Trelane","Liam Trollbane"} + local actors_name = {"Ragnaros", "The Lich King", "Your Neighbor", "Your Raid Leader", "Huffer", "Your Internet Girlfriend", "Mr. President", "Parry Hotter", "Your Math Teacher", "King Djoffrey", UnitName ("player") .. " Snow", "A Drunk Dawrf", "Low Dps Guy", "Helvis Phresley", "Stormwind Guard", "A PvP Player", "Bolvar Fordragon","Malygos","Akama","Anachronos","Lady Blaumeux","Cairne Bloodhoof","Borivar","C'Thun","Drek'Thar","Durotan","Eonar","Footman Malakai","Bolvar Fordragon","Fritz Fizzlesprocket","Lisa Gallywix","M'uru","Priestess MacDonnell","Nazgrel","Ner'zhul","Saria Nightwatcher","Chief Ogg'ora","Ogoun","Grimm Onearm","Apothecary Oni'jus","Orman of Stromgarde","General Rajaxx","Baron Rivendare","Roland","Archmage Trelane","Liam Trollbane"} local actors_classes = CLASS_SORT_ORDER local total_damage = 0 diff --git a/functions/skins.lua b/functions/skins.lua index 68402c28..0b30bb06 100644 --- a/functions/skins.lua +++ b/functions/skins.lua @@ -134,7 +134,7 @@ local _ }, }, ["hide_in_combat_alpha"] = 0, - ["plugins_grow_direction"] = 2, + ["plugins_grow_direction"] = 1, ["menu_icons"] = { true, true, @@ -405,122 +405,208 @@ local _ right_corner_anchor_bottom = {96, 0}, instance_cprops = { - - ["show_statusbar"] = false, - ["backdrop_texture"] = "Details Ground", - --["color"] = {1, 1, 1, 0.919999}, - --["color"] = {0.5960, 0.5686, 1, 0.919999}, purple - ["color"] = {0.70980, 0.75686, 1, 0.919999}, - ["menu_anchor"] = {15, 1, ["side"] = 2}, - ["bg_r"] = 1, - + ["menu_icons_size"] = 0.899999, + ["color"] = { + 0.294117647058824, -- [1] + 0.505882352941176, -- [2] + 1, -- [3] + 0.919999957084656, -- [4] + }, + ["menu_anchor"] = { + 15, -- [1] + 1, -- [2] + ["side"] = 2, + }, + ["bg_r"] = 0.388235294117647, + ["skin"] = "Serenity", + ["following"] = { + ["enabled"] = false, + ["bar_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + ["text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + }, + ["color_buttons"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, ["bars_sort_direction"] = 1, + ["instance_button_anchor"] = { + -27, -- [1] + 1, -- [2] + }, + ["attribute_text"] = { + ["enabled"] = true, + ["shadow"] = false, + ["side"] = 1, + ["text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 0.7, -- [4] + }, + ["custom_text"] = "{name}", + ["text_face"] = "Accidental Presidency", + ["anchor"] = { + -18, -- [1] + 4, -- [2] + }, + ["enable_custom_text"] = false, + ["text_size"] = 12, + }, + ["menu_alpha"] = { + ["enabled"] = false, + ["onenter"] = 1, + ["iconstoo"] = true, + ["ignorebars"] = false, + ["onleave"] = 1, + }, + ["total_bar"] = { + ["enabled"] = false, + ["only_in_group"] = true, + ["icon"] = "Interface\\ICONS\\INV_Sigil_Thorim", + ["color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + }, + ["show_sidebars"] = false, + ["strata"] = "LOW", + ["grab_on_top"] = false, + ["bg_alpha"] = 0.0799999982118607, + ["plugins_grow_direction"] = 1, + ["menu_icons"] = { + true, -- [1] + true, -- [2] + true, -- [3] + true, -- [4] + true, -- [5] + true, -- [6] + ["space"] = -4, + ["shadow"] = false, + }, + ["auto_hide_menu"] = { + ["left"] = false, + ["right"] = false, + }, + ["menu_anchor_down"] = { + 15, -- [1] + -3, -- [2] + }, + ["window_scale"] = 1, + ["bars_grow_direction"] = 1, ["row_info"] = { ["textR_outline"] = false, ["textL_outline"] = false, + ["percent_type"] = 1, ["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small_alpha", - ["textL_enable_custom_text"] = false, + ["textL_show_number"] = true, + ["texture"] = "Details Serenity", ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", - ["texture_background_file"] = "Interface\\AddOns\\Details\\images\\bar4", ["textR_enable_custom_text"] = false, ["texture_background_class_color"] = false, - ["percent_type"] = 1, - ["textL_show_number"] = true, + ["textL_enable_custom_text"] = false, + ["fixed_text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, ["space"] = { ["right"] = 0, ["left"] = 0, ["between"] = 0, }, ["fixed_texture_background_color"] = { - 0, - 0, - 0, - 0.4416468441486359, + 0, -- [1] + 0, -- [2] + 0, -- [3] + 0.441646844148636, -- [4] }, ["textR_custom_text"] = "{data1} ({data2}, {data3}%)", - ["texture"] = "Details Serenity", + ["start_after_icon"] = false, ["font_face_file"] = "Interface\\Addons\\Details\\fonts\\Accidental Presidency.ttf", - ["fixed_text_color"] = { - 1, - 1, - 1, - }, ["backdrop"] = { ["enabled"] = false, ["size"] = 1, ["color"] = { - 1, - 1, - 1, - 1, + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] }, ["texture"] = "Details BarBorder 2", }, ["textL_class_colors"] = false, + ["font_size"] = 10, ["textL_custom_text"] = "{data1}. {data3}{data2}", ["textR_class_colors"] = false, ["alpha"] = 1, ["no_icon"] = false, - ["font_size"] = 10, + ["models"] = { + ["upper_model"] = "Spells\\AcidBreath_SuperGreen.M2", + ["lower_model"] = "World\\EXPANSION02\\DOODADS\\Coldarra\\COLDARRALOCUS.m2", + ["upper_alpha"] = 0.5, + ["lower_enabled"] = false, + ["lower_alpha"] = 0.1, + ["upper_enabled"] = false, + }, ["texture_background"] = "Details D'ictum", ["font_face"] = "Accidental Presidency", ["texture_class_colors"] = true, ["height"] = 15, ["texture_file"] = "Interface\\AddOns\\Details\\images\\bar_serenity", - ["start_after_icon"] = false, + ["texture_background_file"] = "Interface\\AddOns\\Details\\images\\bar4", ["fixed_texture_color"] = { - 0, - 0, - 0, + 0, -- [1] + 0, -- [2] + 0, -- [3] }, }, - ["attribute_text"] = { - ["enabled"] = true, - ["shadow"] = true, - ["side"] = 1, - ["text_size"] = 9, - ["anchor"] = { - -20, - 4, - }, - ["text_color"] = { - 1, - 1, - 1, - 0.7, - }, - ["text_face"] = "Friz Quadrata TT", - }, - - ["menu_anchor_down"] = { - 15, - -3, - }, - ["plugins_grow_direction"] = 1, - ["show_sidebars"] = false, - ["auto_hide_menu"] = { - ["left"] = false, - ["right"] = false, - }, - ["bars_grow_direction"] = 1, ["hide_icon"] = true, - ["menu_icons_size"] = 0.95, + ["statusbar_info"] = { + ["alpha"] = 0.919999957084656, + ["overlay"] = { + 0.294117647058824, -- [1] + 0.505882352941176, -- [2] + 1, -- [3] + }, + }, + ["backdrop_texture"] = "Details Ground", + ["auto_current"] = true, ["toolbar_side"] = 1, - ["bg_g"] = 1, - ["bg_alpha"] = 0.07999999821186066, - ["desaturated_menu"] = false, - wallpaper = { - overlay = {1, 1, 1}, - width = 256, - texcoord = {49/1024, 305/1024, 646/1024, 774/1024}, - enabled = false, - anchor = "all", - height = 128, - alpha = 0.8, - texture = [[Interface\AddOns\Details\images\skins\elvui]], + ["bg_g"] = 0.784313725490196, + ["show_statusbar"] = false, + ["wallpaper"] = { + ["enabled"] = false, + ["texture"] = "Interface\\AddOns\\Details\\images\\skins\\elvui", + ["texcoord"] = { + 0.0478515625, -- [1] + 0.2978515625, -- [2] + 0.630859375, -- [3] + 0.755859375, -- [4] + }, + ["overlay"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + ["anchor"] = "all", + ["height"] = 128, + ["alpha"] = 0.8, + ["width"] = 256, }, ["stretch_button_side"] = 1, ["micro_displays_side"] = 2, + ["desaturated_menu"] = false, ["bg_b"] = 1, }, diff --git a/gumps/janela_principal.lua b/gumps/janela_principal.lua index c342938e..ee0499b4 100644 --- a/gumps/janela_principal.lua +++ b/gumps/janela_principal.lua @@ -4663,20 +4663,14 @@ local build_mode_list = function (self, elapsed) CoolTip:AddLine (Loc ["STRING_MODE_GROUP"]) CoolTip:AddMenu (1, instancia.AlteraModo, 2, true) CoolTip:AddIcon ([[Interface\AddOns\Details\images\modo_icones]], 1, 1, 20, 20, 32/256, 32/256*2, 0, 1) - --CoolTip:AddLine (Loc ["STRING_HELP_MODEGROUP"], nil, 2) - --CoolTip:AddIcon ([[Interface\TUTORIALFRAME\TutorialFrame-QuestionMark]], 2, 1, 16, 16, 8/64, 1 - (8/64), 8/64, 1 - (8/64)) CoolTip:AddLine (Loc ["STRING_MODE_ALL"]) CoolTip:AddMenu (1, instancia.AlteraModo, 3, true) CoolTip:AddIcon ([[Interface\AddOns\Details\images\modo_icones]], 1, 1, 20, 20, 32/256*2, 32/256*3, 0, 1) - --CoolTip:AddLine (Loc ["STRING_HELP_MODEALL"], nil, 2) - --CoolTip:AddIcon ([[Interface\TUTORIALFRAME\TutorialFrame-QuestionMark]], 2, 1, 16, 16, 8/64, 1 - (8/64), 8/64, 1 - (8/64)) CoolTip:AddLine (Loc ["STRING_MODE_RAID"]) CoolTip:AddMenu (1, instancia.AlteraModo, 4, true) CoolTip:AddIcon ([[Interface\AddOns\Details\images\modo_icones]], 1, 1, 20, 20, 32/256*3, 32/256*4, 0, 1) - --CoolTip:AddLine (Loc ["STRING_HELP_MODERAID"], nil, 2) - --CoolTip:AddIcon ([[Interface\TUTORIALFRAME\TutorialFrame-QuestionMark]], 2, 1, 16, 16, 8/64, 1 - (8/64), 8/64, 1 - (8/64)) --build raid plugins list local available_plugins = _detalhes.RaidTables:GetAvailablePlugins() @@ -4701,8 +4695,6 @@ local build_mode_list = function (self, elapsed) CoolTip:AddLine (Loc ["STRING_MODE_SELF"]) CoolTip:AddMenu (1, instancia.AlteraModo, 1, true) CoolTip:AddIcon ([[Interface\AddOns\Details\images\modo_icones]], 1, 1, 20, 20, 0, 32/256, 0, 1) - --CoolTip:AddLine (Loc ["STRING_HELP_MODESELF"], nil, 2) - --CoolTip:AddIcon ([[Interface\TUTORIALFRAME\TutorialFrame-QuestionMark]], 2, 1, 16, 16, 8/64, 1 - (8/64), 8/64, 1 - (8/64)) --build self plugins list diff --git a/gumps/janela_welcome.lua b/gumps/janela_welcome.lua index 9751b6df..da39f07b 100644 --- a/gumps/janela_welcome.lua +++ b/gumps/janela_welcome.lua @@ -24,10 +24,6 @@ function _detalhes:OpenWelcomeWindow () window:SetScript ("OnMouseDown", function() window:StartMoving() end) window:SetScript ("OnMouseUp", function() window:StopMovingOrSizing() end) window:SetScript ("OnHide", function() - --> start tutorial if this is first run - if (_detalhes.tutorial.logons < 2 and _detalhes.is_first_run) then - --_detalhes:StartTutorial() - end _detalhes.tabela_historico:resetar() end) @@ -327,11 +323,11 @@ local window_openned_at = time() local texto_avatar1 = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_avatar1:SetPoint ("topleft", window, "topleft", 20, -80) - texto_avatar1:SetText ("Nickname and Avatar") + texto_avatar1:SetText (Loc ["STRING_WELCOME_60"]) local texto_avatar2 = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_avatar2:SetPoint ("topleft", window, "topleft", 30, -190) - texto_avatar2:SetText ("Avatars are shown up on tooltips and at the player detail window.") + texto_avatar2:SetText (Loc ["STRING_WELCOME_61"]) texto_avatar2:SetTextColor (1, 1, 1, 1) local changemind = g:NewLabel (window, _, "$parentChangeMindAvatarLabel", "ChangeMindAvatarLabel", Loc ["STRING_WELCOME_2"], "GameFontNormal", 9, "orange") @@ -339,11 +335,9 @@ local window_openned_at = time() changemind:SetPoint ("bottom", window, "bottom", 0, 19) changemind.align = "|" - --Ambos são enviados aos demais membros da sua guilda que também usam Details!. Seu apelido é mostrado ao invés do nome do seu personagem. - local texto_avatar3 = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_avatar3:SetPoint ("topleft", window, "topleft", 30, -110) - texto_avatar3:SetText ("Both are sent to the other members of your guild who also use Details!. Your nickname is displayed instead of the name of your character.") + texto_avatar3:SetText (Loc ["STRING_WELCOME_62"]) texto_avatar3:SetWidth (460) texto_avatar3:SetHeight (100) texto_avatar3:SetJustifyH ("left") @@ -980,8 +974,8 @@ local window_openned_at = time() window.animateSlider.tooltip = Loc ["STRING_WELCOME_17"] --------------- Fast Hps/Dps Updates - --[[ - g:NewLabel (window, _, "$parentDpsHpsLabel", "DpsHpsLabel", "Fast Dps/Hps Update" .. ":") + --[ + g:NewLabel (window, _, "$parentDpsHpsLabel", "DpsHpsLabel", Loc ["STRING_WELCOME_63"] .. ":") window.DpsHpsLabel:SetPoint (31, -190) -- g:NewSwitch (window, _, "$parentDpsHpsSlider", "DpsHpsSlider", 60, 20, _, _, _detalhes:GetInstance(1).row_info.fast_ps_update) -- ltext, rtext, defaultv @@ -989,11 +983,11 @@ local window_openned_at = time() window.DpsHpsSlider.OnSwitch = function (self, _, value) --> slider, fixedValue, sliderValue (false, true) _detalhes:GetInstance(1):FastPSUpdate (value) end - window.DpsHpsSlider.tooltip = "When enabled, the Dps and Hps shown is updated faster them total damage or healing." + window.DpsHpsSlider.tooltip = Loc ["STRING_WELCOME_64"] --]] --------------- Max Segments g:NewLabel (window, _, "$parentSliderLabel", "segmentsLabel", Loc ["STRING_WELCOME_21"] .. ":") - window.segmentsLabel:SetPoint (31, -190) + window.segmentsLabel:SetPoint (31, -210) -- g:NewSlider (window, _, "$parentSlider", "segmentsSlider", 120, 20, 1, 25, 1, _detalhes.segments_amount) -- min, max, step, defaultv window.segmentsSlider:SetPoint ("left", window.segmentsLabel, "right", 2, 0) @@ -1018,26 +1012,40 @@ local window_openned_at = time() mech_icon2:SetAlpha (0.6) mech_icon2:SetTexCoord (0, 1, 40/128, 1) mech_icon2:SetDrawLayer ("overlay", 2) - - ---------------- - - local update_frame_alert = CreateFrame ("frame", nil, window) - - + local update_frame_alert = CreateFrame ("frame", nil, window) update_frame_alert:SetScript ("OnShow", function() + + _detalhes.tabela_historico:resetar() + created_test_bars = 0 + + _detalhes.zone_type = "pvp" + + _detalhes:EntrarEmCombate() + _detalhes:StartTestBarUpdate() - --_detalhes.in_combat = true + + if (created_test_bars < 2) then + _detalhes:CreateTestBars() + created_test_bars = created_test_bars + 1 + end + + local instance = _detalhes:GetInstance (1) + instance:SetMode (3) end) update_frame_alert:SetScript ("OnHide", function() _detalhes:StopTestBarUpdate() - --_detalhes.in_combat = false + + _detalhes.parser_functions:ZONE_CHANGED_NEW_AREA() + _detalhes:SairDoCombate() + + instance:SetMode (2) end) ---------------- - pages [#pages+1] = {update_frame_alert, mech_icon2, mech_icon, window.segmentsLabel, window.segmentsSlider, bg, texto4, interval_text, dance_text, window.updatespeedLabel, window.updatespeedSlider, window.animateLabel, window.animateSlider, window.changemind4Label} + pages [#pages+1] = {update_frame_alert, mech_icon2, mech_icon, window.segmentsLabel, window.segmentsSlider, bg, texto4, interval_text, dance_text, window.updatespeedLabel, window.updatespeedSlider, window.animateLabel, window.animateSlider, window.changemind4Label, window.DpsHpsLabel, window.DpsHpsSlider} for _, widget in ipairs (pages[#pages]) do widget:Hide() @@ -1061,7 +1069,7 @@ local window_openned_at = time() local texto_stretch = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_stretch:SetPoint ("topleft", window, "topleft", 181, -105) - texto_stretch:SetText ("The highlighted button is the Stretcher. |cFFFFFF00Click|r and |cFFFFFF00drag up!|r.\n\n\nIf the window is locked, the entire title bar becomes a stretch button.") + texto_stretch:SetText (Loc ["STRING_WELCOME_27"]) texto_stretch:SetWidth (310) texto_stretch:SetHeight (100) texto_stretch:SetJustifyH ("left") @@ -1175,8 +1183,8 @@ local window_openned_at = time() local texto_shortcut = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_shortcut:SetPoint ("topleft", window, "topleft", 25, -110) - texto_shortcut:SetText ("|cFFFFFF00Right clicking|r anywhere in the window shows the |cFFFFAA00Bookmark|r panel.\n\n|cFFFFFF00Right click again|r closes the panel or chooses another display if clicked on a icon.\n\n|cFFFFFF00Left click|r selects the display.") - texto_shortcut:SetWidth (320) + texto_shortcut:SetText (Loc ["STRING_WELCOME_31"]) + texto_shortcut:SetWidth (290) texto_shortcut:SetHeight (90) texto_shortcut:SetJustifyH ("left") texto_shortcut:SetJustifyV ("top") @@ -1189,7 +1197,38 @@ local window_openned_at = time() shortcut_image2:SetHeight (119) shortcut_image2:SetTexCoord (2/512, 167/512, 306/512, 425/512) - pages [#pages+1] = {bg7, texto7, shortcut_image2, texto_shortcut} + + local instance1 = _detalhes:GetInstance (1) + + local bookmark_frame = CreateFrame ("frame", "WelcomeBookmarkFrame", window) + bookmark_frame:SetPoint ("topleft", instance1.baseframe, "topleft") + bookmark_frame:SetPoint ("bottomright", instance1.baseframe, "bottomright") + bookmark_frame:SetBackdrop ({bgFile = [[Interface\AddOns\Details\images\background]], tile = true, tileSize = 64}) + bookmark_frame:SetBackdropColor (0, 0, 0, 0.8) + + local desc_anchor_topleft = _detalhes.gump:NewImage (bookmark_frame, [[Interface\AddOns\Details\images\options_window]], 75, 106, "artwork", {0.19921875, 0.2724609375, 0.6796875, 0.783203125}, "descAnchorBottomLeftImage", "$parentDescAnchorBottomLeftImage") --204 696 279 802 + desc_anchor_topleft:SetPoint ("topleft", bookmark_frame, "topleft", -5, 5) + + local desc_anchor_bottomleft = _detalhes.gump:NewImage (bookmark_frame, [[Interface\AddOns\Details\images\options_window]], 75, 106, "artwork", {0.2724609375, 0.19921875, 0.783203125, 0.6796875}, "descAnchorTopLeftImage", "$parentDescAnchorTopLeftImage") --204 696 279 802 + desc_anchor_bottomleft:SetPoint ("bottomright", bookmark_frame, "bottomright", 5, -5) + + local bmf_string = bookmark_frame:CreateFontString ("overlay", nil, "GameFontNormal") + bmf_string:SetPoint ("center", bookmark_frame, "center") + bmf_string:SetText (Loc ["STRING_WELCOME_65"]) + + local bg_string = _detalhes.gump:NewImage (bookmark_frame, [[Interface\ACHIEVEMENTFRAME\UI-Achievement-RecentHeader]], 256, 32, "border", {0, 1, 0, 23/32}) + bg_string:SetPoint ("left", bookmark_frame, "left", 0, 0) + bg_string:SetPoint ("right", bookmark_frame, "right", 0, 0) + bg_string:SetPoint ("center", bmf_string, "center", 0, 0) + + bookmark_frame:SetScript ("OnMouseDown", function (self, button) + if (button == "RightButton") then + _detalhes.switch:ShowMe (instance1) + self:Hide() + end + end) + + pages [#pages+1] = {bg7, texto7, shortcut_image2, texto_shortcut, bookmark_frame} for _, widget in ipairs (pages[#pages]) do widget:Hide() @@ -1213,7 +1252,7 @@ local window_openned_at = time() local texto_snap = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_snap:SetPoint ("topleft", window, "topleft", 25, -101) - texto_snap:SetText ("Drag a window near other to create a group.\n\nGrouped windows stretch and resize together.\n\nThey also live happier as a couple,") + texto_snap:SetText (Loc ["STRING_WELCOME_66"]) texto_snap:SetWidth (160) texto_snap:SetHeight (110) texto_snap:SetJustifyH ("left") @@ -1232,6 +1271,7 @@ local window_openned_at = time() local group_frame_alert = CreateFrame ("frame", nil, window) group_frame_alert:SetScript ("OnShow", function() _detalhes.tabela_historico:resetar() + created_test_bars = 0 end) pages [#pages+1] = {bg77, texto77, snap_image1, texto_snap, group_frame_alert} @@ -1258,7 +1298,7 @@ local window_openned_at = time() local texto_micro_display = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_micro_display:SetPoint ("topleft", window, "topleft", 25, -101) - texto_micro_display:SetText ("Press shift to expand player's tooltip to show all spells used.\n\nCtrl for targets and Alt for Pets.") + texto_micro_display:SetText (Loc ["STRING_WELCOME_67"]) texto_micro_display:SetWidth (300) texto_micro_display:SetHeight (110) texto_micro_display:SetJustifyH ("left") @@ -1267,12 +1307,87 @@ local window_openned_at = time() local micro_image1 = window:CreateTexture (nil, "overlay") micro_image1:SetTexture ([[Interface\Addons\Details\images\icons]]) - micro_image1:SetPoint ("topright", window, "topright", -15, -95) - micro_image1:SetWidth (136) - micro_image1:SetHeight (83) - micro_image1:SetTexCoord (0, 136/512, 429/512, 1) + micro_image1:SetPoint ("topright", window, "topright", -15, -70) + micro_image1:SetWidth (186) + micro_image1:SetHeight (100) + micro_image1:SetTexCoord (326/512, 1, 85/512, 185/512) - pages [#pages+1] = {bg88, texto88, micro_image1, texto_micro_display} + local tooltip_frame = CreateFrame ("frame", nil, window) + tooltip_frame:SetScript ("OnShow", function (self) + + _detalhes.tabela_historico:resetar() + created_test_bars = 0 + + local current_combat = _detalhes:GetCombat ("current") + local actors_classes = CLASS_SORT_ORDER + local total_damage = 0 + local total_heal = 0 + + local joe = current_combat[1]:PegarCombatente (0x0000000000000, "Joe", 0x114, true) + joe.grupo = true + joe.classe = actors_classes [math.random (1, #actors_classes)] + joe.total = 7500000 + joe.total_without_pet = 7500000 + joe.damage_taken = math.random (100000, 600000) + joe.friendlyfire_total = math.random (100000, 600000) + + total_damage = total_damage + joe.total + + --local joe_death = current_combat[4]:PegarCombatente (0x0000000000000, joe.nome, 0x114, true) + --joe_death.grupo = true + --joe_death.classe = joe.classe + --local esta_morte = {{true, 96648, 100000, time(), 0, "Lady Holenna"}, {true, 96648, 100000, time()-52, 100000, "Lady Holenna"}, {true, 96648, 100000, time()-86, 200000, "Lady Holenna"}, {true, 96648, 100000, time()-101, 300000, "Lady Holenna"}, {false, 55296, 400000, time()-54, 400000, "King Djoffrey"}, {true, 14185, 0, time()-59, 400000, "Lady Holenna"}, {false, 87351, 400000, time()-154, 400000, "King Djoffrey"}, {false, 56236, 400000, time()-158, 400000, "King Djoffrey"} } + --local t = {esta_morte, time(), joe.nome, joe.classe, 400000, "52m 12s", ["dead"] = true} + --table.insert (current_combat.last_events_tables, #current_combat.last_events_tables+1, t) + + rawset (_detalhes.spellcache, 300000, {"A Gun in Your Hand", 300000, [[Interface\ICONS\INV_Legendary_Gun]]}) + rawset (_detalhes.spellcache, 300001, {"Shot", 300001, [[Interface\ICONS\INV_Archaeology_Ogres_HarGunn_Eye]]}) + rawset (_detalhes.spellcache, 300002, {"Mexico Travel", 300002, [[Interface\ICONS\Achievement_Dungeon_Gundrak_Normal]]}) + rawset (_detalhes.spellcache, 300003, {"Rope", 300003, [[Interface\ICONS\Creatureportrait_RopeLadder01]]}) + + joe.targets ["My Old Lady"] = 3500000 + joe.targets ["My Self"] = 2000000 + joe.targets ["Another Man"] = 1000001 + joe.targets ["Another Random Guy"] = 1000001 + + joe.spells:PegaHabilidade (300000, true, "SPELL_DAMAGE"); joe.spells._ActorTable [300000].total = 3500000 + joe.spells:PegaHabilidade (300001, true, "SPELL_DAMAGE"); joe.spells._ActorTable [300001].total = 1000001 + joe.spells:PegaHabilidade (300002, true, "SPELL_DAMAGE"); joe.spells._ActorTable [300002].total = 1000001 + joe.spells:PegaHabilidade (300003, true, "SPELL_DAMAGE"); joe.spells._ActorTable [300003].total = 2000000 + + --current_combat.start_time = time()-360 + current_combat.start_time = GetTime() - 360 + --current_combat.end_time = time() + current_combat.end_time = GetTime() + + current_combat.totals_grupo [1] = total_damage + current_combat.totals [1] = total_damage + + for _, instance in ipairs (_detalhes.tabela_instancias) do + if (instance:IsEnabled()) then + instance:InstanceReset() + end + end + + local bar1 = _detalhes:GetInstance(1):GetRow(1) + + frame_alert.alert:SetPoint ("topleft", bar1, "topleft", -60, 8) + frame_alert.alert:SetPoint ("bottomright", bar1, "bottomright", 60, -10) + + frame_alert.alert.animOut:Stop() + frame_alert.alert.animIn:Play() + if (_detalhes.stopwelcomealert) then + _detalhes:CancelTimer (_detalhes.stopwelcomealert) + end + _detalhes.stopwelcomealert = _detalhes:ScheduleTimer ("StopPlayStretchAlert", 2) + + end) + + tooltip_frame:SetScript ("OnHide", function() + _detalhes:StopPlayStretchAlert() + end) + + pages [#pages+1] = {bg88, texto88, micro_image1, texto_micro_display, tooltip_frame} for _, widget in ipairs (pages[#pages]) do widget:Hide() @@ -1292,10 +1407,10 @@ local window_openned_at = time() local texto11 = window:CreateFontString (nil, "overlay", "GameFontNormal") texto11:SetPoint ("topleft", window, "topleft", 20, -80) texto11:SetText (Loc ["STRING_WELCOME_36"]) - --|cFFFFFF00 + local texto_plugins = window:CreateFontString (nil, "overlay", "GameFontNormal") texto_plugins:SetPoint ("topleft", window, "topleft", 25, -101) - texto_plugins:SetText (Loc ["STRING_WELCOME_37"]) + texto_plugins:SetText (Loc ["STRING_WELCOME_68"]) texto_plugins:SetWidth (220) texto_plugins:SetHeight (110) texto_plugins:SetJustifyH ("left") @@ -1306,10 +1421,10 @@ local window_openned_at = time() local plugins_image1 = window:CreateTexture (nil, "overlay") plugins_image1:SetTexture ([[Interface\Addons\Details\images\icons2]]) - plugins_image1:SetPoint ("topright", window, "topright", -12, -35) - plugins_image1:SetWidth (226) - plugins_image1:SetHeight (181) - plugins_image1:SetTexCoord (0.55859375, 1, 0.646484375, 1) + plugins_image1:SetPoint ("topright", window, "topright", -12, -90) + plugins_image1:SetWidth (281) + plugins_image1:SetHeight (81) + plugins_image1:SetTexCoord (216/512, 497/512, 6/512, 95/512) pages [#pages+1] = {bg11, texto11, plugins_image1, texto_plugins} diff --git a/images/icons.tga b/images/icons.tga index cd3ef55c..4a288ac0 100644 Binary files a/images/icons.tga and b/images/icons.tga differ diff --git a/images/icons2.tga b/images/icons2.tga index 4b6cdee9..8823f67d 100644 Binary files a/images/icons2.tga and b/images/icons2.tga differ diff --git a/startup.lua b/startup.lua index 8a1e6e40..5ee63b3a 100644 --- a/startup.lua +++ b/startup.lua @@ -370,7 +370,7 @@ function _G._detalhes:Start() --version self.gump:Fade (instance._version, 0) - instance._version:SetText ("Details! Alpha " .. _detalhes.userversion .. " (core: " .. self.realversion .. ")") + instance._version:SetText ("Details! Beta " .. _detalhes.userversion .. " (core: " .. self.realversion .. ")") instance._version:SetPoint ("bottomleft", instance.baseframe, "bottomleft", 5, 1) if (instance.auto_switch_to_old) then @@ -447,6 +447,7 @@ function _G._detalhes:Start() _detalhes:OpenWelcomeWindow() end --_detalhes:OpenWelcomeWindow() --debug + -- /run _detalhes:OpenWelcomeWindow() _detalhes:BrokerTick()