From e4de55c297423bfd56eac7e602414a5d4256daf4 Mon Sep 17 00:00:00 2001 From: Tercio Date: Thu, 29 Jan 2015 20:29:17 -0200 Subject: [PATCH] - More tweaks and fixes on skins. - Improvements on Bookmark panel. - Improvements on spec icons with transparency. --- boot.lua | 13 +- core/windows.lua | 73 ++- functions/loaddata.lua | 4 - functions/profiles.lua | 4 - functions/skins.lua | 696 +++++++++++++++++++++-------- gumps/switch.lua | 118 ++++- images/icons.tga | Bin 383915 -> 388124 bytes images/spec_icons_normal_alpha.tga | Bin 480261 -> 477956 bytes 8 files changed, 687 insertions(+), 221 deletions(-) diff --git a/boot.lua b/boot.lua index 4c927e1e..a12cb213 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 = 489 --it's 489 for release - _detalhes.userversion = "v3.9.0" + _detalhes.userversion = "v3.9.1" _detalhes.realversion = 58 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" @@ -20,16 +20,17 @@ do local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" ) --[[ -|cFFFFFF00v3.9.0 (|cFFFFCC00Jan 28, 2015|r|cFFFFFF00)|r:\n\n -|cFFFFFF00-|r Minimalistic V1 is now the default skin again.\n\n -|cFFFFFF00-|r Few improvements on skins.\n\n +|cFFFFFF00v3.9.1 (|cFFFFCC00Jan 29, 2015|r|cFFFFFF00)|r:\n\n +|cFFFFFF00-|r More tweaks and fixes on skins.\n\n +|cFFFFFF00-|r Improvements on Bookmark panel.\n\n +|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n |cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n --]] ---|cFFFFFF00v3.9.0 (|cFFFFCC00Jan 28, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Minimalistic V1 is now the default skin again.\n\n|cFFFFFF00-|r Few improvements on skins.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n +--|cFFFFFF00v3.9.1 (|cFFFFCC00Jan 29, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r More tweaks and fixes in skins.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n -- - Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.9.0 (|cFFFFCC00Jan 28, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Minimalistic V1 is now the default skin again.\n\n|cFFFFFF00-|r Few improvements on skins.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use.\n\n|cFFFFFF00-|r Plugin TimeAttack: fixed problem where sometimes required a reload to start a new time.\n\n|cFFFFFF00-|r Plugin Damage the Game!: fixed a problem where sometimes the time didn't started after level 2.\n\n|cFFFFFF00-|r Added specialization icons.\n\n|cFFFFFF00-|r Fixed Auto-Hide where it wasn't hiding the wallpaper of the window.\n\n|cFFFFFF00-|r Added 'Editing Group' check box on option panel, when enabled, settings changed also are modified on all windows in the group.\n\n|cFFFFFF00-|r Changing window's skin, doesn't change any more settings not related with appearance, for example, Auto-Hide, Switches.\n\n|cFFFFFF00-|r Custom display 'Health Potion & Stone' now also track Healing Tonic.\n\n|cFFFFFF00-|r Custom display 'Damage Taken by Spell' now tracks more spells and also melee hits.\n\n|cFFFFFF00-|r Menus now uses 'Friz Quadrata TT' font as default, also added an option to change it on options panel -> miscellaneous.\n\n|cFFFFFF00-|r 'Switch to Current' feature now switches all windows which have this option enabled.\n\n|cFFFFFF00-|r The message telling to use '/details reinstall' now only shows if a problem happen during the addon load process.\n\n|cFFFFFF00-|r Segments Saved option now can be set to 25, up from 5.\n\n|cFFFFFF00-|r Attempt to fix the bug with the monk spell 'Storm, Earth, and Fire'.\n\n|cFFFFFF00-|r Fixed 'Icon Pick' panel.\n\n|cFFFFFF00-|r Fixed bug when reporting friendly fire through player detail window.\n\n|cFFFFFF00-|r Fixed bug with report window where sometimes it was reporting on a wrong channel.\n\n|cFFFFFF00v3.7.1 (|cFFFFCC00Jan 08, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin 'Damage Rank': is now called 'Damage, the Game!' and had its levels adjusted for WoD.\n\n|cFFFFFF00-|r Plugin 'Tiny Threat': fixed player name where it was showing the realm name too.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed frame details (clicking on a bar) shown behind the Vanguard panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed a problem when clicking with right button wasn't opening the bookmark panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': incoming heals now count shield amount on the player too.\n\n|cFFFFFF00-|r Plugin 'Vanguard' Known Bug: incoming damage and melee vs avoidance seems to be inaccurate by now, we need more time to study and fix it.\n\n|cFFFFFF00-|r Added Twins Ogron's Charge as custom spells, one for the charge by him self and other for the copies (mythic only).\n\n|cFFFFFF00-|r Added option panel for Raid Check plugin.\n\n|cFFFFFF00-|r Added key bindings for open a window, close a window and select a bookmark.\n\n|cFFFFFF00-|r Added 'CTRL + RightClick' closes a window.\n\n|cFFFFFF00-|r Fixed wallpaper transparency after releasing the window from a stretch.|cFFFFFF00-|r Fixed few issues when using class text colors.\n\n|cFFFFFF00-|r Fixed characters name outside instances, now it replaces the realm name with a * and show the complete name on tooltip.\n\n|cFFFFFF00-|r Fixed damage mitigation on damage taken, this affects only specific classes like monk tank.\n\n|cFFFFFF00-|r Fixed auto erase poping up when the player enters on its garrison.\n\n|cFFFFFF00-|r Fixed combat on garrison training dummies which was being marked as Trash Segment.\n\n|cFFFFFF00-|r Fixed command /details disable, wasn't disabling the capture of cooldowns.\n\n|cFFFFFF00-|r Fixed a problem with fast dps/hps when the window is in a empty segment.\n\n|cFFFFFF00-|r Fixed an issue using bookmark panel where it wasn't changing the display when the window is in a plugin mode.\n\n|cFFFFFF00-|r Fixed a bug when bars isn't using class colors on Frags, Auras & Void Zones, Resources and Deaths.\n\n|cFFFFFF00-|r Fixed bar animations when 'Sort Direction' is set to bottom.\n\n|cFFFFFF00-|r Fixed the spam 'you are not in a guild' when checking for new versions.\n\n|cFFFFFF00-|r Fixed translations for Auto Hide Settings bracket under options panel.\n\n|cFFFFFF00-|r Fixed Auto Hide -> Mouse Interaction tool where wans't able to work okey during combat.\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|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'." + Loc ["STRING_VERSION_LOG"] = "|cFFFFFF00v3.9.1 (|cFFFFCC00Jan 29, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r More tweaks and fixes on skins.\n\n|cFFFFFF00-|r Improvements on Bookmark panel.\n\n|cFFFFFF00-|r Improvements on spec icons with transparency.\n\n|cFFFFFF00-|r Create custom spell for Living Bomb explosion.\n\n|cFFFFFF00v3.8.13 (|cFFFFCC00Jan 26, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r RaidCheck (plugin): added an option to be able to use the report panel.\n\n|cFFFFFF00-|r You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel.\n\n|cFFFFFF00-|r Vanguard (plugin): Added Options Panel.\n\n|cFFFFFF00-|r Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen.\n\n|cFFFFFF00-|r Improved specialization detection in order to try detect spec changes.\n\n|cFFFFFF00-|r Added options to change the brackets and the separator for dps/percent block.\n\n|cFFFFFF00-|r Added options for show (or hide) totals, dps and percent amount.\n\n|cFFFFFF00-|r Added Segments shortcut menu pressing Shift + Right click.\n\n|cFFFFFF00-|r Fixed positioning after reopen a window previously closed on last logon.\n\n|cFFFFFF00-|r Fixed enemies display where sometimes the bars were black instead of red.\n\n|cFFFFFF00-|r Fixed few places where spec icons wasn't being used on.\n\n|cFFFFFF00-|r Fixed avoidance panel on Player Details Window where sometimes was giving errors.\n\n|cFFFFFF00-|r Fixed priest shadow and holy detection.\n\n|cFFFFFF00-|r Fixed blood and unholy spec icons.\n\n|cFFFFFF00-|r Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.\n\n|cFFFFFF00v3.8.1 (|cFFFFCC00Jan 17, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin Vanguard: got full rewrite and now it is more easy to use.\n\n|cFFFFFF00-|r Plugin TimeAttack: fixed problem where sometimes required a reload to start a new time.\n\n|cFFFFFF00-|r Plugin Damage the Game!: fixed a problem where sometimes the time didn't started after level 2.\n\n|cFFFFFF00-|r Added specialization icons.\n\n|cFFFFFF00-|r Fixed Auto-Hide where it wasn't hiding the wallpaper of the window.\n\n|cFFFFFF00-|r Added 'Editing Group' check box on option panel, when enabled, settings changed also are modified on all windows in the group.\n\n|cFFFFFF00-|r Changing window's skin, doesn't change any more settings not related with appearance, for example, Auto-Hide, Switches.\n\n|cFFFFFF00-|r Custom display 'Health Potion & Stone' now also track Healing Tonic.\n\n|cFFFFFF00-|r Custom display 'Damage Taken by Spell' now tracks more spells and also melee hits.\n\n|cFFFFFF00-|r Menus now uses 'Friz Quadrata TT' font as default, also added an option to change it on options panel -> miscellaneous.\n\n|cFFFFFF00-|r 'Switch to Current' feature now switches all windows which have this option enabled.\n\n|cFFFFFF00-|r The message telling to use '/details reinstall' now only shows if a problem happen during the addon load process.\n\n|cFFFFFF00-|r Segments Saved option now can be set to 25, up from 5.\n\n|cFFFFFF00-|r Attempt to fix the bug with the monk spell 'Storm, Earth, and Fire'.\n\n|cFFFFFF00-|r Fixed 'Icon Pick' panel.\n\n|cFFFFFF00-|r Fixed bug when reporting friendly fire through player detail window.\n\n|cFFFFFF00-|r Fixed bug with report window where sometimes it was reporting on a wrong channel.\n\n|cFFFFFF00v3.7.1 (|cFFFFCC00Jan 08, 2015|r|cFFFFFF00)|r:\n\n|cFFFFFF00-|r Plugin 'Damage Rank': is now called 'Damage, the Game!' and had its levels adjusted for WoD.\n\n|cFFFFFF00-|r Plugin 'Tiny Threat': fixed player name where it was showing the realm name too.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed frame details (clicking on a bar) shown behind the Vanguard panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': fixed a problem when clicking with right button wasn't opening the bookmark panel.\n\n|cFFFFFF00-|r Plugin 'Vanguard': incoming heals now count shield amount on the player too.\n\n|cFFFFFF00-|r Plugin 'Vanguard' Known Bug: incoming damage and melee vs avoidance seems to be inaccurate by now, we need more time to study and fix it.\n\n|cFFFFFF00-|r Added Twins Ogron's Charge as custom spells, one for the charge by him self and other for the copies (mythic only).\n\n|cFFFFFF00-|r Added option panel for Raid Check plugin.\n\n|cFFFFFF00-|r Added key bindings for open a window, close a window and select a bookmark.\n\n|cFFFFFF00-|r Added 'CTRL + RightClick' closes a window.\n\n|cFFFFFF00-|r Fixed wallpaper transparency after releasing the window from a stretch.|cFFFFFF00-|r Fixed few issues when using class text colors.\n\n|cFFFFFF00-|r Fixed characters name outside instances, now it replaces the realm name with a * and show the complete name on tooltip.\n\n|cFFFFFF00-|r Fixed damage mitigation on damage taken, this affects only specific classes like monk tank.\n\n|cFFFFFF00-|r Fixed auto erase poping up when the player enters on its garrison.\n\n|cFFFFFF00-|r Fixed combat on garrison training dummies which was being marked as Trash Segment.\n\n|cFFFFFF00-|r Fixed command /details disable, wasn't disabling the capture of cooldowns.\n\n|cFFFFFF00-|r Fixed a problem with fast dps/hps when the window is in a empty segment.\n\n|cFFFFFF00-|r Fixed an issue using bookmark panel where it wasn't changing the display when the window is in a plugin mode.\n\n|cFFFFFF00-|r Fixed a bug when bars isn't using class colors on Frags, Auras & Void Zones, Resources and Deaths.\n\n|cFFFFFF00-|r Fixed bar animations when 'Sort Direction' is set to bottom.\n\n|cFFFFFF00-|r Fixed the spam 'you are not in a guild' when checking for new versions.\n\n|cFFFFFF00-|r Fixed translations for Auto Hide Settings bracket under options panel.\n\n|cFFFFFF00-|r Fixed Auto Hide -> Mouse Interaction tool where wans't able to work okey during combat.\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|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'." Loc ["STRING_DETAILS1"] = "|cffffaeaeDetails!:|r " diff --git a/core/windows.lua b/core/windows.lua index a8527832..7899f361 100644 --- a/core/windows.lua +++ b/core/windows.lua @@ -2404,20 +2404,76 @@ function _detalhes:CreateTestBars() local current_combat = _detalhes:GetCombat ("current") + local pclass = select (2, UnitClass ("player")) - 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_name = { + {"Ragnaros", "MAGE", 63}, + {"The Lich King", "DEATHKNIGHT", }, + {"Your Neighbor", "SHAMAN", }, + {"Your Raid Leader", "MONK", }, + {"Huffer", "HUNTER", }, + {"Your Internet Girlfriend", "SHAMAN", }, + {"Mr. President", "WARRIOR", }, + {"Antonidas", "MAGE"}, + {"Your Math Teacher", "SHAMAN", }, + {"King Djoffrey", "PALADIN", }, + {UnitName ("player") .. " Snow", pclass, }, + {"A Drunk Dawrf", "MONK", }, + {"Low Dps Guy", "MONK", }, + {"Helvis Phresley", "DEATHKNIGHT", }, + {"Stormwind Guard", "WARRIOR", }, + {"A PvP Player", "ROGUE", }, + {"Bolvar Fordragon", "PALADIN", }, + {"Malygos", "MAGE", }, + {"Akama", "ROGUE", }, + {"Nozdormu", "MAGE", }, + {"Lady Blaumeux", "DEATHKNIGHT", }, + {"Cairne Bloodhoof", "WARRIOR", }, + {"Borivar", "ROGUE", }, + {"C'Thun", "WARLOCK", }, + {"Drek'Thar", "DEATHKNIGHT", }, + {"Durotan", "WARRIOR", }, + {"Eonar", "DRUID", }, + {"Malfurion Stormrage", "DRUID", }, + {"Footman Malakai", "WARRIOR", }, + {"Bolvar Fordragon", "PALADIN", }, + {"Fritz Fizzlesprocket", "HUNTER", }, + {"Lisa Gallywix", "ROGUE", }, + {"M'uru", "WARLOCK", }, + {"Priestess MacDonnell", "PRIEST", }, + {"Elune", "PRIEST", }, + {"Nazgrel", "WARRIOR", }, + {"Ner'zhul", "WARLOCK", }, + {"Saria Nightwatcher", "PALADIN", }, + {"Kael'thas Sunstrider", "MAGE", 63}, + {"Velen", "PRIEST"}, + {"Tyrande Whisperwind", "PRIEST", 257}, + {"Sargeras", "WARLOCK", 267}, + {"Arthas", "PALADIN", }, + {"Orman of Stromgarde", "WARRIOR", }, + {"General Rajaxx", "WARRIOR", }, + {"Baron Rivendare", "DEATHKNIGHT", }, + {"Roland", "MAGE", }, + {"Archmage Trelane", "MAGE", }, + {"Lilian Voss", "ROGUE", }, + } local actors_classes = CLASS_SORT_ORDER local total_damage = 0 local total_heal = 0 for i = 1, 10 do - local robot = current_combat[1]:PegarCombatente (0x0000000000000, actors_name [math.random (1, #actors_name)], 0x114, true) + + local who = actors_name [math.random (1, #actors_name)] + + local robot = current_combat[1]:PegarCombatente (0x0000000000000, who[1], 0x114, true) robot.grupo = true - robot.classe = actors_classes [math.random (1, #actors_classes)] + robot.classe = who [2] - if (robot.classe == "DEATHKNIGHT") then + if (who[3]) then + robot.spec = who[3] + elseif (robot.classe == "DEATHKNIGHT") then local specs = {250, 251, 252} robot.spec = specs [math.random (1, #specs)] elseif (robot.classe == "DRUID") then @@ -2472,11 +2528,14 @@ robot.spells._ActorTable [56488].total = robot.total end - local robot = current_combat[2]:PegarCombatente (0x0000000000000, actors_name [math.random (1, #actors_name)], 0x114, true) + local who = actors_name [math.random (1, #actors_name)] + local robot = current_combat[2]:PegarCombatente (0x0000000000000, who[1], 0x114, true) robot.grupo = true - robot.classe = actors_classes [math.random (1, #actors_classes)] + robot.classe = who[2] - if (robot.classe == "DEATHKNIGHT") then + if (who[3]) then + robot.spec = who[3] + elseif (robot.classe == "DEATHKNIGHT") then local specs = {250, 251, 252} robot.spec = specs [math.random (1, #specs)] elseif (robot.classe == "DRUID") then diff --git a/functions/loaddata.lua b/functions/loaddata.lua index 93f53311..3ed93017 100644 --- a/functions/loaddata.lua +++ b/functions/loaddata.lua @@ -1,7 +1,3 @@ ---File Revision: 1 ---Last Modification: 07/04/2014 --- Change Log: - -- 07/04/2014: File Created. ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/functions/profiles.lua b/functions/profiles.lua index 1c1abf3e..25cff328 100644 --- a/functions/profiles.lua +++ b/functions/profiles.lua @@ -1,7 +1,3 @@ ---File Revision: 1 ---Last Modification: 07/04/2014 --- Change Log: - -- 07/04/2014: File Created. ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/functions/skins.lua b/functions/skins.lua index 5f9b4444..843a128f 100644 --- a/functions/skins.lua +++ b/functions/skins.lua @@ -66,168 +66,180 @@ local _ micro_frames = {left = "DETAILS_STATUSBAR_PLUGIN_THREAT"}, instance_cprops = { - ["hide_in_combat_type"] = 1, + ["menu_icons_size"] = 1, ["color"] = { - 1, - 1, - 1, - 1, + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] }, ["menu_anchor"] = { - 13, - 2, + 13, -- [1] + 2, -- [2] ["side"] = 2, }, ["bg_r"] = 0.0941, ["color_buttons"] = { - 1, - 1, - 1, - 1, + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] }, ["bars_sort_direction"] = 1, ["attribute_text"] = { ["enabled"] = true, ["shadow"] = false, ["side"] = 1, - ["text_size"] = 10, - ["anchor"] = { - 5, - 3, - }, ["text_color"] = { - 0.823529411764706, - 0.549019607843137, - 0, - 1, + 0.823529411764706, -- [1] + 0.549019607843137, -- [2] + 0, -- [3] + 1, -- [4] }, + ["custom_text"] = "{name}", ["text_face"] = "Friz Quadrata TT", - }, - ["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, + ["anchor"] = { + 6, -- [1] + 3, -- [2] }, + ["text_size"] = 10, + ["enable_custom_text"] = false, }, - ["hide_out_of_combat"] = false, - ["strata"] = "LOW", ["micro_displays_side"] = 2, - ["row_show_animation"] = { - ["anim"] = "Fade", - ["options"] = { - }, - }, - ["hide_in_combat_alpha"] = 0, - ["plugins_grow_direction"] = 1, - ["menu_icons"] = { - true, - true, - true, - true, - true, -- [5] - true, -- [6] - }, - ["desaturated_menu"] = false, - ["show_sidebars"] = true, - ["statusbar_info"] = { - ["alpha"] = 1, - ["overlay"] = { - 1, - 1, - 1, - }, - }, - ["window_scale"] = 1, ["auto_hide_menu"] = { ["left"] = false, ["right"] = false, }, - ["grab_on_top"] = false, - ["hide_icon"] = false, - ["row_info"] = { - ["textR_outline"] = false, - ["textL_outline"] = true, - ["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small", - ["fixed_texture_color"] = { - 0, - 0, - 0, - }, - ["texture_background_file"] = "Interface\\AddOns\\Details\\images\\bar4", - ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", - ["textR_enable_custom_text"] = false, - ["texture_background_class_color"] = false, - ["textL_enable_custom_text"] = false, - ["textL_show_number"] = true, - ["space"] = { - ["right"] = -5, - ["left"] = 3, - ["between"] = 2, - }, - ["fixed_texture_background_color"] = { - 0.619607, - 0.619607, - 0.619607, - 0.116164, - }, - ["textR_custom_text"] = "{data1} ({data2}, {data3}%)", - ["start_after_icon"] = true, - ["font_face_file"] = "Fonts\\ARIALN.TTF", - ["fixed_text_color"] = { - 1, - 1, - 1, - }, - ["backdrop"] = { - ["enabled"] = false, - ["size"] = 6, - ["color"] = { - 0, - 0, - 0, - 0.305214, - }, - ["texture"] = "Details BarBorder 2", - }, - ["textL_class_colors"] = false, - ["textL_custom_text"] = "{data1}. {data3}{data2}", - ["textR_class_colors"] = false, - ["alpha"] = 1, - ["no_icon"] = false, - ["font_size"] = 10, - ["texture_background"] = "Details Serenity", - ["font_face"] = "Arial Narrow", - ["texture_class_colors"] = true, - ["height"] = 14, - ["texture_file"] = "Interface\\AddOns\\Details\\images\\bar4", - ["texture"] = "Details Serenity", - ["percent_type"] = 1, + ["desaturated_menu"] = false, + ["plugins_grow_direction"] = 1, + ["menu_icons"] = { + true, -- [1] + true, -- [2] + true, -- [3] + true, -- [4] + true, -- [5] + false, -- [6] + ["space"] = -4, + ["shadow"] = true, }, + ["show_sidebars"] = true, ["menu_anchor_down"] = { + -14, -- [1] + -3, -- [2] ["side"] = 2, - -14, - -3, + }, + ["backdrop_texture"] = "Details Ground", + ["statusbar_info"] = { + ["alpha"] = 1, + ["overlay"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, }, ["toolbar_side"] = 1, ["bg_g"] = 0.0941, ["bars_grow_direction"] = 1, - ["hide_in_combat"] = false, - ["backdrop_texture"] = "Details Ground", + ["row_info"] = { + ["textR_outline"] = false, + ["spec_file"] = "Interface\\AddOns\\Details\\images\\spec_icons_normal", + ["textL_outline"] = true, + ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", + ["textR_show_data"] = { + true, -- [1] + true, -- [2] + true, -- [3] + }, + ["textL_enable_custom_text"] = false, + ["fixed_text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + ["space"] = { + ["right"] = -5, + ["left"] = 3, + ["between"] = 1, + }, + ["texture_background_class_color"] = false, + ["start_after_icon"] = true, + ["font_face_file"] = "Fonts\\ARIALN.TTF", + ["textL_custom_text"] = "{data1}. {data3}{data2}", + ["font_size"] = 10, + ["height"] = 14, + ["texture_file"] = "Interface\\AddOns\\Details\\images\\bar4", + ["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small", + ["textR_bracket"] = "(", + ["textR_enable_custom_text"] = false, + ["fixed_texture_color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + }, + ["textL_show_number"] = true, + ["textR_custom_text"] = "{data1} ({data2}, {data3}%)", + ["texture"] = "Details Serenity", + ["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_file"] = "Interface\\AddOns\\Details\\images\\bar_background", + ["texture_background"] = "DGround", + ["use_spec_icons"] = true, + ["textR_class_colors"] = false, + ["alpha"] = 1, + ["no_icon"] = false, + ["percent_type"] = 1, + ["fixed_texture_background_color"] = { + 0.619607, -- [1] + 0.619607, -- [2] + 0.619607, -- [3] + 0.116164, -- [4] + }, + ["font_face"] = "Arial Narrow", + ["texture_class_colors"] = true, + ["backdrop"] = { + ["enabled"] = false, + ["texture"] = "Details BarBorder 2", + ["color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + 0.305214, -- [4] + }, + ["size"] = 6, + }, + ["fast_ps_update"] = false, + ["textR_separator"] = ",", + ["textL_class_colors"] = false, + }, ["show_statusbar"] = true, - ["menu_icons_size"] = 1, - ["stretch_button_side"] = 1, ["bg_alpha"] = 0.699999988079071, + ["wallpaper"] = { + ["enabled"] = false, + ["texcoord"] = { + 0, -- [1] + 1, -- [2] + 0, -- [3] + 1, -- [4] + }, + ["overlay"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["anchor"] = "all", + ["height"] = 0, + ["alpha"] = 0.5, + ["width"] = 0, + }, + ["stretch_button_side"] = 1, + ["hide_icon"] = false, ["bg_b"] = 0.0941, }, @@ -472,29 +484,178 @@ local _ --overwrites instance_cprops = { - hide_icon = true, - - menu_icons_size = 0.90, - menu_anchor = {16, 2, side = 2}, - menu_anchor_down = {16, -2}, - - plugins_grow_direction = 1, - - show_sidebars = false, - show_statusbar = false, - color = {0.3058, 0.3058, 0.3058, 0.8838}, --0.9350 - bg_alpha = 0.3181, --0.4399 - - row_info = { - texture = "BantoBar", --"Details Serenity" - font_face = "Arial Narrow", - texture_background_class_color = false, - texture_background = "Details Serenity", - fixed_texture_background_color = {0, 0, 0, 0.3186}, - icon_file = [[Interface\AddOns\Details\images\classes_small_alpha]], - start_after_icon = false, + ["color"] = { + 0.3058, -- [1] + 0.3058, -- [2] + 0.3058, -- [3] + 0.8838, -- [4] }, - attribute_text = {enabled = true, side = 1, text_size = 11, anchor = {-18, 5}, text_color = {1, 1, 1, 1}, text_face = "Arial Narrow"}, + ["menu_anchor"] = { + 16, -- [1] + 2, -- [2] + ["side"] = 2, + }, + ["bg_r"] = 0.0941, + ["color_buttons"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["backdrop_texture"] = "Details Ground", + ["row_info"] = { + ["textR_outline"] = false, + ["spec_file"] = "Interface\\AddOns\\Details\\images\\spec_icons_normal", + ["textL_outline"] = false, + ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", + ["textR_show_data"] = { + true, -- [1] + true, -- [2] + true, -- [3] + }, + ["textL_enable_custom_text"] = false, + ["fixed_text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + ["space"] = { + ["right"] = 0, + ["left"] = 0, + ["between"] = 1, + }, + ["texture_background_class_color"] = false, + ["start_after_icon"] = false, + ["font_face_file"] = "Fonts\\ARIALN.TTF", + ["textL_custom_text"] = "{data1}. {data3}{data2}", + ["font_size"] = 10, + ["height"] = 14, + ["texture_file"] = "Interface\\AddOns\\Details\\images\\bar_serenity", + ["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small_alpha", + ["textR_bracket"] = "(", + ["textR_enable_custom_text"] = false, + ["fixed_texture_color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + }, + ["textL_show_number"] = true, + ["textR_custom_text"] = "{data1} ({data2}, {data3}%)", + ["texture"] = "Details Serenity", + ["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_file"] = "Interface\\AddOns\\Details\\images\\bar_background", + ["texture_background"] = "DGround", + ["use_spec_icons"] = true, + ["textR_class_colors"] = false, + ["alpha"] = 1, + ["no_icon"] = false, + ["percent_type"] = 1, + ["fixed_texture_background_color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + 0.319999992847443, -- [4] + }, + ["font_face"] = "Arial Narrow", + ["texture_class_colors"] = true, + ["backdrop"] = { + ["enabled"] = false, + ["texture"] = "Details BarBorder 2", + ["color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["size"] = 12, + }, + ["fast_ps_update"] = false, + ["textR_separator"] = ",", + ["textL_class_colors"] = false, + }, + ["micro_displays_side"] = 2, + ["strata"] = "LOW", + ["bg_alpha"] = 0.3181, + ["plugins_grow_direction"] = 1, + ["menu_icons"] = { + true, -- [1] + true, -- [2] + true, -- [3] + true, -- [4] + true, -- [5] + false, -- [6] + ["space"] = -4, + ["shadow"] = false, + }, + ["desaturated_menu"] = false, + ["show_sidebars"] = false, + ["menu_anchor_down"] = { + 16, -- [1] + -2, -- [2] + }, + ["statusbar_info"] = { + ["alpha"] = 1, + ["overlay"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + }, + ["hide_icon"] = true, + ["toolbar_side"] = 1, + ["bg_g"] = 0.0941, + ["show_statusbar"] = false, + ["menu_icons_size"] = 0.899999976158142, + ["wallpaper"] = { + ["enabled"] = false, + ["texcoord"] = { + 0, -- [1] + 1, -- [2] + 0, -- [3] + 1, -- [4] + }, + ["overlay"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["anchor"] = "all", + ["height"] = 0, + ["alpha"] = 0.5, + ["width"] = 0, + }, + ["auto_hide_menu"] = { + ["left"] = false, + ["right"] = false, + }, + ["attribute_text"] = { + ["enabled"] = true, + ["shadow"] = false, + ["side"] = 1, + ["text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["custom_text"] = "{name}", + ["text_face"] = "Arial Narrow", + ["anchor"] = { + -18, -- [1] + 5, -- [2] + }, + ["text_size"] = 11, + ["enable_custom_text"] = false, + }, + ["bg_b"] = 0.0941, }, callback = function (skin, instance, just_updating) @@ -1207,48 +1368,195 @@ local _ --[[ when a skin is selected, all customized properties of the window is reseted and then the overwrites are applied]] --[[ for the complete cprop list see the file classe_instancia_include.lua]] instance_cprops = { - - menu_icons_size = 0.90, - menu_anchor = {16, 2, side = 2}, - menu_anchor_down = {16, -2}, - plugins_grow_direction = 1, - menu_icons = {shadow = true}, - - attribute_text = {enabled = true, anchor = {-20, 5}, text_face = "Accidental Presidency", text_size = 12, text_color = {1, 1, 1, .7}, side = 1, shadow = true}, - - hide_icon = true, - desaturated_menu = false, - - bg_alpha = 0.51, - bg_r = 0.3294, - bg_g = 0.3294, - bg_b = 0.3294, - show_statusbar = false, - - row_info = { - texture = "Skyline", - texture_class_colors = true, - alpha = 0.80, - texture_background_class_color = false, - texture_background = "Details D'ictum", - fixed_texture_color = {0, 0, 0}, - fixed_texture_background_color = {0, 0, 0, 0.471}, - space = {left = 1, right = -2, between = 0}, - backdrop = {enabled = true, size = 4, color = {0, 0, 0, 1}, texture = "Details BarBorder 2"}, - icon_file = [[Interface\AddOns\Details\images\classes_small_alpha]], - start_after_icon = false, + ["menu_icons_size"] = 0.899999976158142, + ["color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] }, - - wallpaper = { - overlay = {1, 1, 1}, - width = 256, - texcoord = {49/1024, 305/1024, 774/1024, 646/1024}, - enabled = true, - anchor = "all", - height = 128, - alpha = 0.8, - texture = [[Interface\AddOns\Details\images\skins\elvui]], - } + ["menu_anchor"] = { + 16, -- [1] + 2, -- [2] + ["side"] = 2, + }, + ["bg_r"] = 0.3294, + ["skin"] = "ElvUI Frame Style", + ["following"] = { + ["bar_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + ["enabled"] = true, + ["text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + }, + ["color_buttons"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 1, -- [4] + }, + ["bars_sort_direction"] = 1, + ["attribute_text"] = { + ["enabled"] = true, + ["shadow"] = true, + ["side"] = 1, + ["text_size"] = 12, + ["custom_text"] = "{name}", + ["text_face"] = "FORCED SQUARE", + ["anchor"] = { + -19, -- [1] + 6, -- [2] + }, + ["text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + 0.7, -- [4] + }, + ["enable_custom_text"] = false, + }, + ["row_info"] = { + ["textR_outline"] = false, + ["spec_file"] = "Interface\\AddOns\\Details\\images\\spec_icons_normal_alpha", + ["textL_outline"] = false, + ["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight", + ["textR_show_data"] = { + true, -- [1] + true, -- [2] + true, -- [3] + }, + ["textL_enable_custom_text"] = false, + ["fixed_text_color"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + ["space"] = { + ["right"] = -2, + ["left"] = 1, + ["between"] = 1, + }, + ["texture_background_class_color"] = false, + ["start_after_icon"] = false, + ["font_face_file"] = "Interface\\Addons\\Details\\fonts\\FORCED SQUARE.ttf", + ["textL_custom_text"] = "{data1}. {data3}{data2}", + ["font_size"] = 10, + ["height"] = 14, + ["texture_file"] = "Interface\\AddOns\\Details\\images\\bar4", + ["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small_alpha", + ["textR_bracket"] = "(", + ["textR_enable_custom_text"] = false, + ["fixed_texture_color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + }, + ["textL_show_number"] = true, + ["textR_custom_text"] = "{data1} ({data2}, {data3}%)", + ["texture"] = "Skyline", + ["use_spec_icons"] = true, + ["textR_class_colors"] = false, + ["textL_class_colors"] = false, + ["texture_background_file"] = "Interface\\AddOns\\Details\\images\\bar_background", + ["texture_background"] = "DGround", + ["alpha"] = 0.8, + ["no_icon"] = false, + ["percent_type"] = 1, + ["fixed_texture_background_color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + 0.339636147022247, -- [4] + }, + ["font_face"] = "FORCED SQUARE", + ["texture_class_colors"] = true, + ["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, + }, + ["fast_ps_update"] = false, + ["textR_separator"] = ",", + ["backdrop"] = { + ["enabled"] = false, + ["size"] = 4, + ["color"] = { + 0, -- [1] + 0, -- [2] + 0, -- [3] + 1, -- [4] + }, + ["texture"] = "Details BarBorder 2", + }, + }, + ["auto_hide_menu"] = { + ["left"] = false, + ["right"] = false, + }, + ["desaturated_menu"] = false, + ["plugins_grow_direction"] = 1, + ["menu_icons"] = { + true, -- [1] + true, -- [2] + true, -- [3] + true, -- [4] + true, -- [5] + false, -- [6] + ["space"] = -4, + ["shadow"] = true, + }, + ["show_sidebars"] = true, + ["bars_grow_direction"] = 1, + ["menu_anchor_down"] = { + 16, -- [1] + -2, -- [2] + }, + ["backdrop_texture"] = "Details Ground", + ["statusbar_info"] = { + ["alpha"] = 1, + ["overlay"] = { + 1, -- [1] + 1, -- [2] + 1, -- [3] + }, + }, + ["toolbar_side"] = 1, + ["bg_g"] = 0.3294, + ["micro_displays_side"] = 2, + ["bg_alpha"] = 0.51, + ["show_statusbar"] = false, + ["wallpaper"] = { + ["enabled"] = true, + ["texture"] = "Interface\\AddOns\\Details\\images\\skins\\elvui", + ["texcoord"] = { + 0.0480000019073486, -- [1] + 0.298000011444092, -- [2] + 0.630999984741211, -- [3] + 0.755999984741211, -- [4] + }, + ["overlay"] = { + 0.999997794628143, -- [1] + 0.999997794628143, -- [2] + 0.999997794628143, -- [3] + 0.799998223781586, -- [4] + }, + ["anchor"] = "all", + ["height"] = 225.999984741211, + ["alpha"] = 0.800000071525574, + ["width"] = 266.000061035156, + }, + ["stretch_button_side"] = 1, + ["hide_icon"] = true, + ["bg_b"] = 0.3294, }, skin_options = { @@ -1263,7 +1571,7 @@ local _ author = "Details!", version = "1.0", site = "unknown", - desc = "This skin is based on ElvUI's addons, with an opaque title bar.", + desc = "based on AddonSkins for ElvUI, this skin has opaque title bar and background.", --general can_change_alpha_head = true, diff --git a/gumps/switch.lua b/gumps/switch.lua index 35d7e92d..e821d057 100644 --- a/gumps/switch.lua +++ b/gumps/switch.lua @@ -43,7 +43,7 @@ do frame.topbg:SetPoint ("bottomright", frame, "topright") frame.topbg:SetHeight (20) frame.topbg:SetDesaturated (true) - frame.topbg:SetVertexColor (.3, .3, .3, 0.8) + frame.topbg:SetVertexColor (.3, .3, .3, 1) frame.topbg_frame = CreateFrame ("frame", nil, frame) frame.topbg_frame:SetPoint ("bottomleft", frame, "topleft") @@ -66,6 +66,94 @@ do frame.title_label:SetPoint ("left", frame.star, "right", 4, -1) frame.title_label:SetText ("Bookmark") +--------------------------------------------------------------------------------------------------------------------------- + + frame.editing_window = nil + local windowcolor_callback = function (button, r, g, b, a) + local instance = frame.editing_window + + if (instance.menu_alpha.enabled and a ~= instance.color[4]) then + _detalhes:Msg (Loc ["STRING_OPTIONS_MENU_ALPHAWARNING"]) + instance:InstanceColor (r, g, b, instance.menu_alpha.onleave, nil, true) + + if (_detalhes.options_group_edit) then + for _, this_instance in ipairs (instance:GetInstanceGroup()) do + if (this_instance ~= instance) then + this_instance:InstanceColor (r, g, b, instance.menu_alpha.onleave, nil, true) + end + end + end + + return + end + + instance:InstanceColor (r, g, b, a, nil, true) + if (_detalhes.options_group_edit) then + for _, this_instance in ipairs (instance:GetInstanceGroup()) do + if (this_instance ~= instance) then + this_instance:InstanceColor (r, g, b, a, nil, true) + end + end + end + end + + local change_color = function() + frame.editing_window = _detalhes.switch.current_instancia + local r, g, b, a = unpack (frame.editing_window.color) + _detalhes.gump:ColorPick (frame, r, g, b, a, windowcolor_callback) + _detalhes.switch:CloseMe() + end + + local window_color = gump:CreateButton (frame.topbg_frame, change_color, 14, 14) + window_color:SetPoint ("bottomright", frame, "topright", -3, 2) + + local window_color_texture = gump:CreateImage (window_color, [[Interface\AddOns\Details\images\icons]], 14, 14, "artwork", {434/512, 466/512, 277/512, 307/512}) + window_color_texture:SetAlpha (0.25) + window_color_texture:SetAllPoints() + + window_color:SetHook ("OnEnter", function() + window_color_texture:SetAlpha (1) + GameCooltip:Reset() + _detalhes:CooltipPreset (1) + GameCooltip:AddLine (Loc ["STRING_OPTIONS_INSTANCE_COLOR"]) + GameCooltip:SetOwner (window_color.widget) + GameCooltip:SetType ("tooltip") + GameCooltip:Show() + end) + window_color:SetHook ("OnLeave", function() + window_color_texture:SetAlpha (0.25) + GameCooltip:Hide() + end) + +--------------------------------------------------------------------------------------------------------------------------- + + local open_options = function() + _detalhes:OpenOptionsWindow (_detalhes.switch.current_instancia) + _detalhes.switch:CloseMe() + end + local options_button = gump:CreateButton (frame.topbg_frame, open_options, 14, 14, open_options) + options_button:SetPoint ("right", window_color, "left", -2, 0) + + local options_button_texture = gump:CreateImage (options_button, [[Interface\AddOns\Details\images\modo_icones]], 14, 14, "artwork", {0.5, 0.625, 0, 1}) + options_button_texture:SetAlpha (0.25) + options_button_texture:SetAllPoints() + + options_button:SetHook ("OnEnter", function() + options_button_texture:SetAlpha (1) + GameCooltip:Reset() + _detalhes:CooltipPreset (1) + GameCooltip:AddLine (Loc ["STRING_INTERFACE_OPENOPTIONS"]) + GameCooltip:SetOwner (window_color.widget) + GameCooltip:SetType ("tooltip") + GameCooltip:Show() + end) + options_button:SetHook ("OnLeave", function() + options_button_texture:SetAlpha (0.25) + GameCooltip:Hide() + end) + +--------------------------------------------------------------------------------------------------------------------------- + function _detalhes.switch:CloseMe() _detalhes.switch.frame:Hide() GameCooltip:Hide() @@ -373,6 +461,16 @@ function _detalhes.switch:ShowMe (instancia) local altura = instancia.baseframe:GetHeight() local mostrar_quantas = _math_floor (altura / _detalhes.switch.button_height) * 2 + local precisa_mostrar = 0 + for i = 1, #_detalhes.switch.table do + local slot = _detalhes.switch.table [i] + if (slot.atributo) then + precisa_mostrar = precisa_mostrar + 1 + else + break + end + end + if (_detalhes.switch.mostrar_quantas ~= mostrar_quantas) then for i = 1, #_detalhes.switch.buttons do if (i <= mostrar_quantas) then @@ -389,7 +487,7 @@ function _detalhes.switch:ShowMe (instancia) _detalhes.switch.mostrar_quantas = mostrar_quantas end - _detalhes.switch:Resize() + _detalhes.switch:Resize (precisa_mostrar) _detalhes.switch:Update() _detalhes.switch.frame:SetScale (instancia.window_scale) @@ -438,7 +536,7 @@ function _detalhes.switch:ShowMe (instancia) SwitchPanelTutorial.close_label:SetWidth (_detalhes.switch.frame:GetWidth()-30) end - _detalhes.switch:Resize() + _detalhes.switch:Resize (precisa_mostrar) --instancia:StatusBarAlert (right_click_text, right_click_texture) --icon, color, time end @@ -660,15 +758,23 @@ function _detalhes.switch:Update() end -function _detalhes.switch:Resize() +function _detalhes.switch:Resize (precisa_mostrar) local x = 7 local y = 5 + local y_increment = 20 local window_width, window_height = _detalhes.switch.current_instancia:GetSize() local horizontal_amt = floor (math.max (window_width / 100, 2)) - local vertical_amt = floor ((window_height - y) / 20) + local vertical_amt = floor ((window_height - y) / y_increment) + + local total_amt = horizontal_amt * vertical_amt + if (precisa_mostrar > total_amt) then + vertical_amt = floor ((window_height - y) / 15) + y_increment = 15 + end + local size = window_width / horizontal_amt local frame = _detalhes.switch.frame @@ -712,7 +818,7 @@ function _detalhes.switch:Resize() break end end - y = y + 20 + y = y + y_increment end _detalhes.switch.slots = i-1 diff --git a/images/icons.tga b/images/icons.tga index bc9f7c45f610fa0417d88ca9cf4a67e0dbebb9fb..44419d6e9969a647661699cd4122cdd1b0770b30 100644 GIT binary patch delta 4984 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 delta 701 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