Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

- Added a new tab on options panel for tooltip configuration.

Browse Source 
- Added a new tab on options panel for broker config.
- Added new abbreviation method called "comma".
- Fully removed the delete button switch between instances, new all instances have a delete button.
- Full re-write on the instance, delete and close buttons.
- Fixed the total healing done by the raid group which was counting overheal too.
- HotCorners now sort icons according with most used.
- Few changes on all skins in order to fit on the new right menu buttons.
- Added Horde avatars.
- Fixed issue where shortcut panel shows below thw windows when its in Dialog strata.
- Fixed problem with import data capture for charts.

- API Cooltip: Added new option: TextShadow -> true or false.
- New API: _detalhes.StatusBar:SetPlugin (instance, pluginname, anchor)
- New API: _detalhes:SetPlayerDetailsWindowTexture (texture)
- New API: _detalhes:SetOptionsWindowTexture (texture)
This commit is contained in:
tercio
2014-05-16 01:26:21 -03:00
parent 5cf85b8eb4
commit 81771ec1ec
40 changed files with 2148 additions and 1602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/LibHotCorners/LibHotCorners.lua
+41 -7
View File
@@ -8,6 +8,7 @@ end
local LBD = LibStub ("LibDataBroker-1.1")
local debug = false
local tinsert = tinsert
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> main function
@@ -15,7 +16,8 @@ local debug = false
LibHotCorners.embeds = LibHotCorners.embeds or {}
local embed_functions = {
"RegisterHotCornerButton",
"HideHotCornerButton"
"HideHotCornerButton",
"QuickHotCornerEnable"
}
function LibHotCorners:Embed (target)
@@ -39,9 +41,25 @@ local debug = false
end
function LibHotCorners:RegisterHotCornerButton (name, corner, savedtable, fname, icon, tooltip, clickfunc, menus, quickfunc, onenter, onleave)
corner = string.lower (corner)
test (corner)
if (savedtable and not LibHotCorners.options) then
if (not savedtable.__cachedoptions) then
savedtable.__cachedoptions = {age = 0, clicks = {}, disabled = {}}
end
LibHotCorners.options = savedtable.__cachedoptions
LibHotCorners.options.age = LibHotCorners.options.age + 1
elseif (savedtable) then
if (LibHotCorners.options.age < savedtable.__cachedoptions.age) then
LibHotCorners.options = savedtable.__cachedoptions
LibHotCorners.options.age = LibHotCorners.options.age + 1
end
end
savedtable = savedtable or {}
tinsert (LibHotCorners [corner], {name = name, fname = fname, savedtable = savedtable, icon = icon, tooltip = tooltip, click = clickfunc, menus = menus, quickfunc = quickclick, onenter = onenter, onleave = onleave})
LibHotCorners [corner].map [name] = #LibHotCorners [corner]
@@ -94,7 +112,7 @@ local debug = false
addon_table.savedtable.hide = value
print (LibHotCorners, corner)
--print (LibHotCorners, corner)
LibHotCorners [corner].is_enabled = false
for index, button_table in ipairs (corner_table) do
@@ -114,7 +132,7 @@ local debug = false
return
end
if (dataobj.icon and dataobj.OnClick and not dataobj.HotCornerIgnore) then
LibHotCorners:RegisterHotCornerButton (name, "TopLeft", {}, name .. "HotCornerLauncher", dataobj.icon, dataobj.OnTooltipShow, dataobj.OnClick, nil, nil, dataobj.OnEnter, dataobj.OnLeave)
LibHotCorners:RegisterHotCornerButton (name, "TopLeft", nil, name .. "HotCornerLauncher", dataobj.icon, dataobj.OnTooltipShow, dataobj.OnClick, nil, nil, dataobj.OnEnter, dataobj.OnLeave)
end
end
LBD.RegisterCallback (LibHotCorners, "DataBrokerCallback")
@@ -124,12 +142,15 @@ local debug = false
f:SetScript ("OnEvent", function()
for name, dataobj in LBD:DataObjectIterator() do
if (dataobj.type and dataobj.icon and dataobj.OnClick and not dataobj.HotCornerIgnore) then
LibHotCorners:RegisterHotCornerButton (name, "TopLeft", {}, name .. "HotCornerLauncher", dataobj.icon, dataobj.OnTooltipShow, dataobj.OnClick, nil, nil, dataobj.OnEnter, dataobj.OnLeave)
LibHotCorners:RegisterHotCornerButton (name, "TopLeft", nil, name .. "HotCornerLauncher", dataobj.icon, dataobj.OnTooltipShow, dataobj.OnClick, nil, nil, dataobj.OnEnter, dataobj.OnLeave)
end
end
--for k, v in pairs (LBD.attributestorage) do
-- print (k, v.type)
--end
for k, v in pairs (LBD.attributestorage) do
--print (k, v)
--print ("----------------")
--vardump (v)
end
f:UnregisterEvent ("PLAYER_LOGIN")
end)
@@ -163,6 +184,10 @@ local debug = false
end
--> corner frame on enter
local more_clicked = function (t1, t2)
return t1[1] > t2[1]
end
function HotCornersOnEnter (self)
if (not LibHotCorners [self.position].is_enabled) then
return
@@ -172,7 +197,14 @@ local debug = false
local i = 1
local sort = {}
for index, button_table in ipairs (LibHotCorners [self.position]) do
tinsert (sort, {LibHotCorners.options.clicks [button_table.name] or 0, button_table})
end
table.sort (sort, more_clicked)
for index, button_table in ipairs (sort) do
button_table = button_table [2]
if (not button_table.widget) then
LibHotCorners:CreateAddonWidget (self, button_table, index, self.position)
end
@@ -247,6 +279,8 @@ local debug = false
self:SetPoint ("topleft", self:GetParent(), "topleft", self.x, -4)
end
if (self.table.click) then
LibHotCorners.options.clicks [self.table.name] = LibHotCorners.options.clicks [self.table.name] or 0
LibHotCorners.options.clicks [self.table.name] = LibHotCorners.options.clicks [self.table.name] + 1
self.table.click (self, button)
end
end
Libs/NickTag-1.0/NickTag-1.0.lua
+22 -1
View File
@@ -122,9 +122,13 @@ end
{[[Interface\EncounterJournal\UI-EJ-BOSS-Baelog]], "Baelog"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Baron Ashbury]], "Baron Ashbury"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Baron Silverlaine]], "Baron Silverlaine"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Blood Guard Porung]], "Blood Guard Porung"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Bronjahm]], "Bronjahm"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Brother Korloff]], "Brother Korloff"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Captain Skarloc]], "Captain Skarloc"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Chief Ukorz Sandscalp]], "Chief Ukorz Sandscalp"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Commander Kolurg]], "Commander Kolurg"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Commander Malor]], "Commander Malor"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Commander Sarannis]], "Commander Sarannis"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Commander Springvale]], "Commander Springvale"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Commander Stoutbeard]], "Commander Stoutbeard"},
@@ -138,10 +142,17 @@ end
{[[Interface\EncounterJournal\UI-EJ-BOSS-Empyreal Queens]], "Lu'lin"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Exarch Maladaar]], "Exarch Maladaar"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Fineous Darkvire]], "Fineous Darkvire"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Galdarah]], "Galdarah"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Garajal the Spiritbinder]], "Garajal the Spiritbinder"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Garrosh Hellscream]], "Garrosh Hellscream"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-General Nazgrim]], "General Nazgrim"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Grand Champions-Alliance]], "Grand Champions-Alliance"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Grand Champions-Horde]], "Grand Champions-Horde"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Grand Magus Telestra]], "Grand Magus Telestra"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-HateRel]], "HateRel"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Hazzarah]], "Hazzarah"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Hearthsinger Forresten]], "Hearthsinger Forresten"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Helix Gearbreaker]], "Helix Gearbreaker"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-High Botanist Freywinn]], "High Botanist Freywinn"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-High Inquisitor Whitemane]], "High Inquisitor Whitemane"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-High Interrogator Gerstahn]], "High Interrogator Gerstahn"},
@@ -151,12 +162,14 @@ end
{[[Interface\EncounterJournal\UI-EJ-BOSS-Hydromancer Velratha]], "Hydromancer Velratha"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Illyanna Ravenoak]], "Illyanna Ravenoak"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Ingvar the Plunderer]], "Ingvar the Plunderer"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Instructor Galford]], "Instructor Galford"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Instructor Malicia]], "Instructor Malicia"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Interrogator Vishas]], "Interrogator Vishas"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Isiset]], "Isiset"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-JainaProudmoore]], "Jaina Proudmoore"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Jandice Barov]], "Jandice Barov"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Kaelthas Sunstrider]], "Kaelthas Sunstrider"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Kelidan the Breaker]], "Kelidan the Breaker"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Krick]], "Krick"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Lady Anacondra]], "Lady Anacondra"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Lady Illucia Barov]], "Lady Illucia Barov"},
@@ -180,12 +193,20 @@ end
{[[Interface\EncounterJournal\UI-EJ-BOSS-Princess Moira Bronzebeard]], "Princess Moira Bronzebeard"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-QueenAzshara]], "Queen Azshara"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Randolph Moloch]], "Randolph Moloch"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Renataki]], "Renataki"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Ribbly Screwspigot]], "Ribbly Screwspigot"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Scarlet Commander Mograine]], "Scarlet Commander Mograine"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Selin Fireheart]], "Selin Fireheart"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Siegecrafter Blackfuse]], "Siegecrafter Blackfuse"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Skarvald the Constructor]], "Skarvald the Constructor"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Tribunal of the Ages]], "Tribunal of the Ages"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-TyrandeWhisperwind]], "Tyrande Whisperwind"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Vanessa VanCleef]], "Vanessa VanCleef"}
{[[Interface\EncounterJournal\UI-EJ-BOSS-Twilight Lord Kelris]], "Twilight Lord Kelris"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Vanessa VanCleef]], "Vanessa VanCleef"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Vazruden]], "Vazruden"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Warchief Rend Blackhand]], "Warchief Rend Blackhand"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Willey Hopebreaker]], "Willey Hopebreaker"},
{[[Interface\EncounterJournal\UI-EJ-BOSS-Witch Doctor Zumrah]], "Witch Doctor Zumrah"},
}
------------------------------------------------------------------------------------------------------------------------------------------------------
--> send and receive functions
Libs/libs.xml
+1 -1
View File
@@ -9,8 +9,8 @@
<Include file="AceTimer-3.0\AceTimer-3.0.xml" />
<Include file="LibSharedMedia-3.0\lib.xml" />
<Include file="NickTag-1.0\NickTag-1.0.xml" />
<Include file="LibHotCorners\LibHotCorners.xml" />
<Script file="LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
<Script file="LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
<Include file="LibHotCorners\LibHotCorners.xml" />
<Script file="LibGraph-2.0\LibGraph-2.0.lua"/>
</Ui>
boot.lua
+2 -2
View File
@@ -8,9 +8,9 @@
_ = nil
_detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0", "LibHotCorners")
_detalhes.userversion = "v1.13.8a"
_detalhes.userversion = "v1.14.0"
_detalhes.version = "Alpha 017"
_detalhes.realversion = 17
_detalhes.realversion = 18
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> initialization stuff
classes/classe_damage.lua
+90 -57
View File
@@ -64,8 +64,14 @@ local ToKFunctions = _detalhes.ToKFunctions
local SelectedToKFunction = ToKFunctions [1]
local UsingCustomRightText = false
local FormatTooltipNumber = ToKFunctions [8]
local TooltipMaximizedMethod = 1
local CLASS_ICON_TCOORDS = _G.CLASS_ICON_TCOORDS
local key_overlay = {1, 1, 1, .1}
local key_overlay_press = {1, 1, 1, .2}
local info = _detalhes.janela_info
local keyName
@@ -241,20 +247,13 @@ function atributo_damage:ContainerRefreshDps (container, combat_time)
end
function _detalhes:ToolTipFrags (instancia, frag, esta_barra)
function _detalhes:ToolTipFrags (instancia, frag, esta_barra, keydown)
--vardump (frag)
local name = frag [1]
local GameCooltip = GameCooltip
GameCooltip:Reset()
GameCooltip:SetType ("tooltip")
GameCooltip:SetOwner (esta_barra)
GameCooltip:SetOption ("LeftBorderSize", -5)
GameCooltip:SetOption ("RightBorderSize", 5)
GameCooltip:SetOption ("StatusBarTexture", [[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
--> mantendo a função o mais low level possível
local damage_container = instancia.showing [1]
@@ -288,23 +287,39 @@ function _detalhes:ToolTipFrags (instancia, frag, esta_barra)
GameCooltip:AddLine (Loc ["STRING_FROM"], nil, nil, headerColor, nil, 12)
GameCooltip:AddIcon ([[Interface\Addons\Details\images\icons]], 1, 1, 14, 14, 0.126953125, 0.1796875, 0, 0.0546875)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
for i = 1, math.min (6, #damage_taken_table) do
local min = 6
local ismaximized = false
if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then
min = 99
ismaximized = true
end
if (ismaximized) then
--highlight shift key
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, 1)
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
end
for i = 1, math.min (min, #damage_taken_table) do
local t = damage_taken_table [i]
GameCooltip:AddLine (t [1], _detalhes:comma_value (t [2]))
GameCooltip:AddLine (t [1], FormatTooltipNumber (_, t [2]))
local classe = t [3]
if (not classe) then
classe = "UNKNOW"
end
if (classe == "UNKNOW") then
GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1)
else
GameCooltip:AddIcon (instancia.row_info.icon_file, nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe]))
end
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
GameCooltip:AddLine (Loc ["STRING_REPORT_LEFTCLICK"], nil, 1, "white")
@@ -414,7 +429,7 @@ function atributo_damage:ReportSingleVoidZoneLine (actor, instancia)
return _detalhes:Reportar (reportar, {_no_current = true, _no_inverse = true, _custom = true})
end
function _detalhes:ToolTipVoidZones (instancia, actor, barra)
function _detalhes:ToolTipVoidZones (instancia, actor, barra, keydown)
local damage_actor = instancia.showing[1]:PegarCombatente (_, actor.damage_twin)
local habilidade
@@ -460,20 +475,13 @@ function _detalhes:ToolTipVoidZones (instancia, actor, barra)
local GameCooltip = GameCooltip
GameCooltip:Reset()
GameCooltip:SetType ("tooltip")
GameCooltip:SetOwner (barra)
GameCooltip:SetOption ("LeftBorderSize", -5)
GameCooltip:SetOption ("RightBorderSize", 5)
GameCooltip:SetOption ("StatusBarTexture", [[Interface\WorldStateFrame\WORLDSTATEFINALSCORE-HIGHLIGHT]])
for _, alvo in _ipairs (container) do
local minutos, segundos = _math_floor (alvo.uptime / 60), _math_floor (alvo.uptime % 60)
if (minutos > 0) then
GameCooltip:AddLine (alvo.nome, _detalhes:comma_value (alvo.damage) .. " (" .. minutos .. "m " .. segundos .. "s" .. ")")
GameCooltip:AddLine (alvo.nome, FormatTooltipNumber (_, alvo.damage) .. " (" .. minutos .. "m " .. segundos .. "s" .. ")")
else
GameCooltip:AddLine (alvo.nome, _detalhes:comma_value (alvo.damage) .. " (" .. segundos .. "s" .. ")")
GameCooltip:AddLine (alvo.nome, FormatTooltipNumber (_, alvo.damage) .. " (" .. segundos .. "s" .. ")")
end
local classe = _detalhes:GetClass (alvo.nome)
@@ -483,7 +491,7 @@ function _detalhes:ToolTipVoidZones (instancia, actor, barra)
GameCooltip:AddIcon ("Interface\\LFGFRAME\\LFGROLE_BW", nil, nil, 14, 14, .25, .5, 0, 1)
end
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
@@ -1417,8 +1425,7 @@ local barAlha = .6
end
---------> DAMAGE DONE & DPS
local key_overlay = {1, 1, 1, .1}
local key_overlay_press = {1, 1, 1, .2}
function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
@@ -1431,6 +1438,8 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
do
--> TOP HABILIDADES
--get variables
local ActorDamage = self.total_without_pet
local ActorDamageWithPet = self.total
if (ActorDamage == 0) then
@@ -1439,6 +1448,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
local ActorSkillsContainer = self.spell_tables._ActorTable
local ActorSkillsSortTable = {}
--get time type
local meu_tempo
if (_detalhes.time_type == 1 or not self.grupo) then
meu_tempo = self:Tempo()
@@ -1446,56 +1456,60 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
meu_tempo = self:GetCombatTime()
end
--add and sort
for _spellid, _skill in _pairs (ActorSkillsContainer) do
ActorSkillsSortTable [#ActorSkillsSortTable+1] = {_spellid, _skill.total, _skill.total/meu_tempo}
--local nome_magia, _, icone_magia = _GetSpellInfo (_spellid)
--print ("==============")
--print (nome_magia, _skill.total)
end
_table_sort (ActorSkillsSortTable, _detalhes.Sort2)
--> TOP INIMIGOS
--get variables
local ActorTargetsContainer = self.targets._ActorTable
local ActorTargetsSortTable = {}
--add and sort
for _, _target in _ipairs (ActorTargetsContainer) do
ActorTargetsSortTable [#ActorTargetsSortTable+1] = {_target.nome, _target.total}
end
_table_sort (ActorTargetsSortTable, _detalhes.Sort2)
--tooltip stuff
local tooltip_max_abilities = _detalhes.tooltip_max_abilities
if (instancia.sub_atributo == 2) then
tooltip_max_abilities = 6
end
if (keydown == "shift") then
local is_maximized = false
if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then
tooltip_max_abilities = 99
is_maximized = true
end
--> MOSTRA HABILIDADES
GameCooltip:AddLine (Loc ["STRING_SPELLS"].."", nil, nil, headerColor, nil, 12)
GameCooltip:AddIcon ([[Interface\ICONS\Spell_Shaman_BlessingOfTheEternals]], 1, 1, 14, 14, 0.90625, 0.109375, 0.15625, 0.875)
if (tooltip_max_abilities == 99) then
if (is_maximized) then
--highlight shift key
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
end
--habilidades
--habilidades
if (#ActorSkillsSortTable > 0) then
for i = 1, _math_min (tooltip_max_abilities, #ActorSkillsSortTable) do
local SkillTable = ActorSkillsSortTable [i]
local nome_magia, _, icone_magia = _GetSpellInfo (SkillTable [1])
if (instancia.sub_atributo == 1 or instancia.sub_atributo == 6) then
GameCooltip:AddLine (nome_magia..": ", _detalhes:comma_value (SkillTable [2]) .." (".._cstr("%.1f", SkillTable [2]/ActorDamage*100).."%)")
GameCooltip:AddLine (nome_magia..": ", FormatTooltipNumber (_, SkillTable [2]) .." (".._cstr("%.1f", SkillTable [2]/ActorDamage*100).."%)")
else
GameCooltip:AddLine (nome_magia..": ", _detalhes:comma_value (_math_floor (SkillTable [3])) .." (".._cstr("%.1f", SkillTable [2]/ActorDamage*100).."%)")
GameCooltip:AddLine (nome_magia..": ", FormatTooltipNumber (_, _math_floor (SkillTable [3])) .." (".._cstr("%.1f", SkillTable [2]/ActorDamage*100).."%)")
end
GameCooltip:AddIcon (icone_magia, nil, nil, 14, 14)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
else
GameCooltip:AddLine (Loc ["STRING_NO_SPELL"])
@@ -1506,12 +1520,16 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
GameCooltip:AddLine (Loc ["STRING_TARGETS"].."", nil, nil, headerColor, nil, 12)
local max_targets = _detalhes.tooltip_max_targets
if (keydown == "ctrl") then
local is_maximized = false
if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then
max_targets = 99
is_maximized = true
end
GameCooltip:AddIcon ([[Interface\Addons\Details\images\icons]], 1, 1, 14, 14, 0, 0.03125, 0.126953125, 0.15625)
if (max_targets == 99) then
if (is_maximized) then
--highlight
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
else
@@ -1521,9 +1539,9 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
for i = 1, _math_min (max_targets, #ActorTargetsSortTable) do
local este_inimigo = ActorTargetsSortTable [i]
GameCooltip:AddLine (este_inimigo[1]..": ", _detalhes:comma_value (este_inimigo[2]) .." (".._cstr("%.1f", este_inimigo[2]/ActorDamageWithPet*100).."%)")
GameCooltip:AddLine (este_inimigo[1]..": ", FormatTooltipNumber (_, este_inimigo[2]) .." (".._cstr("%.1f", este_inimigo[2]/ActorDamageWithPet*100).."%)")
GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\espadas", nil, nil, 14, 14)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .2)
_detalhes:AddTooltipBackgroundStatusbar()
end
end
end
@@ -1582,11 +1600,17 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
local _quantidade = 0
local added_logo = false
_table_sort (totais, _detalhes.Sort2)
local ismaximized = false
if (keydown == "alt" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 5) then
ismaximized = true
end
for index, _table in _ipairs (totais) do
if (_table [2] > 0 and (index < 3 or keydown == "alt")) then
if (_table [2] > 0 and (index < 3 or ismaximized)) then
if (not added_logo) then
added_logo = true
@@ -1594,7 +1618,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
GameCooltip:AddIcon ([[Interface\COMMON\friendship-heart]], 1, 1, 14, 14, 0.21875, 0.78125, 0.09375, 0.6875)
if (keydown == "alt") then
if (ismaximized) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
else
@@ -1606,11 +1630,11 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
local n = _table [1]:gsub (("%s%<.*"), "")
if (instancia.sub_atributo == 1) then
GameCooltip:AddLine (n, _detalhes:comma_value (_table [2]) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
GameCooltip:AddLine (n, FormatTooltipNumber (_, _table [2]) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
else
GameCooltip:AddLine (n, _detalhes:comma_value ( _math_floor (_table [3])) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
GameCooltip:AddLine (n, FormatTooltipNumber (_, _math_floor (_table [3])) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
end
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small]], 1, 1, 14, 14, 0.25, 0.49609375, 0.75, 1)
end
end
@@ -1656,15 +1680,18 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown)
max = 6
end
if (keydown == "shift") then
local ismaximized = false
if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then
max = #meus_agressores
ismaximized = true
end
GameCooltip:AddLine (Loc ["STRING_FROM"], nil, nil, headerColor, nil, 12)
GameCooltip:AddIcon ([[Interface\Addons\Details\images\icons]], 1, 1, 14, 14, 0.126953125, 0.1796875, 0, 0.0546875)
if (keydown == "shift") then
if (ismaximized) then
--highlight
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
else
@@ -1673,7 +1700,7 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown)
end
for i = 1, max do
GameCooltip:AddLine (meus_agressores[i][1]..": ", _detalhes:comma_value (meus_agressores[i][2]).." (".._cstr("%.1f", (meus_agressores[i][2]/damage_taken) * 100).."%)")
GameCooltip:AddLine (meus_agressores[i][1]..": ", FormatTooltipNumber (_, meus_agressores[i][2]).." (".._cstr("%.1f", (meus_agressores[i][2]/damage_taken) * 100).."%)")
local classe = meus_agressores[i][3]
if (not classe) then
@@ -1685,7 +1712,7 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown)
else
GameCooltip:AddIcon (instancia.row_info.icon_file, nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe]))
end
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
return true
@@ -1727,16 +1754,18 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown
GameCooltip:AddIcon ([[Interface\Addons\Details\images\icons]], 1, 1, 14, 14, 0.126953125, 0.224609375, 0.056640625, 0.140625)
if (keydown == "shift") then
local ismaximized = false
if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
ismaximized = true
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
end
local max_abilities = _detalhes.tooltip_max_abilities
if (keydown == "shift") then
if (ismaximized) then
max_abilities = 99
end
@@ -1746,9 +1775,9 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown
classe = "UNKNOW"
end
GameCooltip:AddLine (DamagedPlayers[i][1]..": ", _detalhes:comma_value (DamagedPlayers[i][2]).." (".._cstr("%.1f", DamagedPlayers[i][2]/FriendlyFireTotal*100).."%)")
GameCooltip:AddLine (DamagedPlayers[i][1]..": ", FormatTooltipNumber (_, DamagedPlayers[i][2]).." (".._cstr("%.1f", DamagedPlayers[i][2]/FriendlyFireTotal*100).."%)")
GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\espadas", nil, nil, 14, 14)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
if (classe == "UNKNOW") then
GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords ["UNKNOW"]))
@@ -1762,24 +1791,26 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown
GameCooltip:AddIcon ([[Interface\PVPFrame\bg-down-on]], 1, 1, 14, 14, 0, 1, 0, 1)
if (keydown == "ctrl") then
local ismaximized = false
if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
ismaximized = true
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
end
local max_abilities2 = _detalhes.tooltip_max_abilities
if (keydown == "ctrl") then
if (ismaximized) then
max_abilities2 = 99
end
for i = 1, _math_min (max_abilities2, #Skills) do
local nome, _, icone = _GetSpellInfo (Skills[i][1])
GameCooltip:AddLine (nome.." (x".. Skills[i][3].."): ", _detalhes:comma_value (Skills[i][2]).." (".._cstr("%.1f", Skills[i][2]/FriendlyFireTotal*100).."%)")
GameCooltip:AddLine (nome.." (x".. Skills[i][3].."): ", FormatTooltipNumber (_, Skills[i][2]).." (".._cstr("%.1f", Skills[i][2]/FriendlyFireTotal*100).."%)")
GameCooltip:AddIcon (icone, nil, nil, 14, 14)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
return true
@@ -2818,6 +2849,8 @@ end
--> atualize a funcao de abreviacao
function atributo_damage:UpdateSelectedToKFunction()
SelectedToKFunction = ToKFunctions [_detalhes.ps_abbreviation]
FormatTooltipNumber = ToKFunctions [_detalhes.tooltip.abbreviation]
TooltipMaximizedMethod = _detalhes.tooltip.maximize_method
end
--> diminui o total das tabelas do combate
classes/classe_energy.lua
+46 -11
View File
@@ -65,6 +65,9 @@ local ToKFunctions = _detalhes.ToKFunctions
local SelectedToKFunction = ToKFunctions [1]
local UsingCustomRightText = false
local FormatTooltipNumber = ToKFunctions [8]
local TooltipMaximizedMethod = 1
local info = _detalhes.janela_info
local keyName
@@ -686,11 +689,11 @@ end
---------> TOOLTIPS BIFURCAÇÃO
function atributo_energy:ToolTip (instancia, numero, barra)
function atributo_energy:ToolTip (instancia, numero, barra, keydown)
--> seria possivel aqui colocar o icone da classe dele?
--GameCooltip:AddLine (barra.colocacao..". "..self.nome)
if (instancia.sub_atributo <= 4) then
return self:ToolTipRegenRecebido (instancia, numero, barra)
return self:ToolTipRegenRecebido (instancia, numero, barra, keydown)
end
end
--> tooltip locals
@@ -698,7 +701,10 @@ local r, g, b
local headerColor = "yellow"
local barAlha = .6
function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra)
local key_overlay = {1, 1, 1, .1}
local key_overlay_press = {1, 1, 1, .2}
function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown)
local owner = self.owner
if (owner and owner.classe) then
@@ -720,33 +726,60 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra)
-----------------------------------------------------------------
GameCooltip:AddLine (Loc ["STRING_SPELLS"], nil, nil, headerColor, nil, 12) --> localiza-me
GameCooltip:AddIcon ([[Interface\HELPFRAME\ReportLagIcon-Spells]], 1, 1, 14, 14, 0.21875, 0.78125, 0.21875, 0.78125)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
local ismaximized = false
if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
ismaximized = true
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
end
local max = #habilidades
if (max > 3) then
max = 3
end
if (ismaximized) then
max = 99
end
for i = 1, max do
for i = 1, math.min (#habilidades, max) do
local nome_magia, _, icone_magia = _GetSpellInfo (habilidades[i][1])
GameCooltip:AddLine (nome_magia..": ", _detalhes:comma_value (habilidades[i][2]).." (".._cstr("%.1f", (habilidades[i][2]/total_regenerado) * 100).."%)")
GameCooltip:AddLine (nome_magia..": ", FormatTooltipNumber (_, habilidades[i][2]).." (".._cstr("%.1f", (habilidades[i][2]/total_regenerado) * 100).."%)")
GameCooltip:AddIcon (icone_magia)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
-----------------------------------------------------------------
GameCooltip:AddLine (Loc ["STRING_PLAYERS"], nil, nil, headerColor, nil, 12) --> localiza-me
GameCooltip:AddIcon ([[Interface\HELPFRAME\HelpIcon-HotIssues]], 1, 1, 14, 14, 0.21875, 0.78125, 0.21875, 0.78125)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
local ismaximized = false
if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
ismaximized = true
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
end
max = #fontes
if (max > 3) then
max = 3
end
for i = 1, max do
GameCooltip:AddLine (fontes[i][1]..": ", _detalhes:comma_value (fontes[i][2]).." (".._cstr("%.1f", (fontes[i][2]/total_regenerado) * 100).."%)")
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
if (ismaximized) then
max = 99
end
for i = 1, math.min (#fontes, max) do
GameCooltip:AddLine (fontes[i][1]..": ", FormatTooltipNumber (_, fontes[i][2]).." (".._cstr("%.1f", (fontes[i][2]/total_regenerado) * 100).."%)")
_detalhes:AddTooltipBackgroundStatusbar()
local classe = fontes[i][3]
if (not classe) then
@@ -969,6 +1002,8 @@ end
--> atualize a funcao de abreviacao
function atributo_energy:UpdateSelectedToKFunction()
SelectedToKFunction = ToKFunctions [_detalhes.ps_abbreviation]
FormatTooltipNumber = ToKFunctions [_detalhes.tooltip.abbreviation]
TooltipMaximizedMethod = _detalhes.tooltip.maximize_method
end
--> subtract total from a combat table
classes/classe_heal.lua
+39 -22
View File
@@ -61,6 +61,9 @@ local ToKFunctions = _detalhes.ToKFunctions
local SelectedToKFunction = ToKFunctions [1]
local UsingCustomRightText = false
local FormatTooltipNumber = ToKFunctions [8]
local TooltipMaximizedMethod = 1
local info = _detalhes.janela_info
local keyName
@@ -860,27 +863,29 @@ function atributo_heal:ToolTip_HealingTaken (instancia, numero, barra, keydown)
GameCooltip:AddIcon ([[Interface\TUTORIALFRAME\UI-TutorialFrame-LevelUp]], 1, 1, 14, 14, 0.10546875, 0.89453125, 0.05859375, 0.6796875)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
if (keydown == "shift") then
local ismaximized = false
if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
ismaximized = true
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
end
_table_sort (meus_curadores, function (a, b) return a[2] > b[2] end)
local max = #meus_curadores
if (max > 6) then
max = 6
end
if (keydown == "shift") then
if (ismaximized) then
max = 99
end
for i = 1, _math_min (max, #meus_curadores) do
GameCooltip:AddLine (meus_curadores[i][1]..": ", _detalhes:comma_value (meus_curadores[i][2]).." (".._cstr ("%.1f", (meus_curadores[i][2]/total_curado) * 100).."%)")
GameCooltip:AddLine (meus_curadores[i][1]..": ", FormatTooltipNumber (_, meus_curadores[i][2]).." (".._cstr ("%.1f", (meus_curadores[i][2]/total_curado) * 100).."%)")
local classe = meus_curadores[i][3]
if (not classe) then
classe = "UNKNOW"
@@ -890,7 +895,7 @@ function atributo_heal:ToolTip_HealingTaken (instancia, numero, barra, keydown)
else
GameCooltip:AddIcon ("Interface\\AddOns\\Details\\images\\classes_small", nil, nil, 14, 14, _unpack (_detalhes.class_coords [classe]))
end
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
return true
@@ -898,6 +903,7 @@ end
---------> HEALING DONE / HPS / OVERHEAL
local background_heal_vs_absorbs = {value = 100, color = {1, 1, 0, .25}, specialSpark = false, texture = [[Interface\AddOns\Details\images\bar4_glass]]}
function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
local owner = self.owner
@@ -944,9 +950,11 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
GameCooltip:AddLine (Loc ["STRING_SPELLS"], nil, nil, headerColor, nil, 12) --> localiza-me
GameCooltip:AddIcon ([[Interface\RAIDFRAME\Raid-Icon-Rez]], 1, 1, 14, 14, 0.109375, 0.890625, 0.0625, 0.90625)
if (keydown == "shift") then
local ismaximized = false
if (keydown == "shift" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 3) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
ismaximized = true
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
@@ -957,7 +965,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
tooltip_max_abilities = 6
end
if (keydown == "shift") then
if (ismaximized) then
tooltip_max_abilities = 99
end
@@ -966,16 +974,16 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
break
end
if (instancia.sub_atributo == 2) then --> hps
GameCooltip:AddLine (ActorHealingTable[i][4][1]..": ", _detalhes:comma_value ( _math_floor (ActorHealingTable[i][5])).." (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)")
GameCooltip:AddLine (ActorHealingTable[i][4][1]..": ", FormatTooltipNumber (_, _math_floor (ActorHealingTable[i][5])).." (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)")
elseif (instancia.sub_atributo == 3) then --> overheal
local overheal = ActorHealingTable[i][2]
local total = ActorHealingTable[i][6]
GameCooltip:AddLine (ActorHealingTable[i][4][1] .." (|cFFFF3333" .. _math_floor ( (overheal / (overheal+total)) *100) .. "%|r):", _detalhes:comma_value ( _math_floor (ActorHealingTable[i][5])).." (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)")
GameCooltip:AddLine (ActorHealingTable[i][4][1] .." (|cFFFF3333" .. _math_floor ( (overheal / (overheal+total)) *100) .. "%|r):", FormatTooltipNumber (_, _math_floor (ActorHealingTable[i][5])).." (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)")
else
GameCooltip:AddLine (ActorHealingTable[i][4][1]..": ", _detalhes:comma_value (ActorHealingTable[i][2]).." (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)")
GameCooltip:AddLine (ActorHealingTable[i][4][1]..": ", FormatTooltipNumber (_, ActorHealingTable[i][2]).." (".._cstr ("%.1f", ActorHealingTable[i][3]).."%)")
end
GameCooltip:AddIcon (ActorHealingTable[i][4][3], nil, nil, 14, 14)
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
end
if (instancia.sub_atributo == 6) then
@@ -991,16 +999,18 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
GameCooltip:AddLine (Loc ["STRING_TARGETS"].."", nil, nil, headerColor, nil, 12)
GameCooltip:AddIcon ([[Interface\TUTORIALFRAME\UI-TutorialFrame-LevelUp]], 1, 1, 14, 14, 0.10546875, 0.89453125, 0.05859375, 0.6796875)
if (keydown == "ctrl") then
local ismaximized = false
if (keydown == "ctrl" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 4) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
ismaximized = true
else
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_ctrl]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
end
local tooltip_max_abilities2 = _detalhes.tooltip_max_abilities
if (keydown == "ctrl") then
if (ismaximized) then
tooltip_max_abilities2 = 99
end
@@ -1009,12 +1019,12 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
break
end
if (tooltip_max_abilities2 == 99 and ActorHealingTargets[i][1]:find (_detalhes.playername)) then
GameCooltip:AddLine (ActorHealingTargets[i][1]..": ", _detalhes:comma_value (ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)", nil, "yellow")
if (ismaximized and ActorHealingTargets[i][1]:find (_detalhes.playername)) then
GameCooltip:AddLine (ActorHealingTargets[i][1]..": ", FormatTooltipNumber (_, ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)", nil, "yellow")
GameCooltip:AddStatusBar (100, 1, .5, .5, .5, .7)
else
GameCooltip:AddLine (ActorHealingTargets[i][1]..": ", _detalhes:comma_value (ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)")
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
GameCooltip:AddLine (ActorHealingTargets[i][1]..": ", FormatTooltipNumber (_, ActorHealingTargets[i][2]) .." (".._cstr ("%.1f", ActorHealingTargets[i][3]).."%)")
_detalhes:AddTooltipBackgroundStatusbar()
end
local targetActor = container:PegarCombatente (nil, ActorHealingTargets[i][1])
@@ -1088,9 +1098,14 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
_table_sort (totais, _detalhes.Sort2)
local ismaximized = false
if (keydown == "alt" or TooltipMaximizedMethod == 2 or TooltipMaximizedMethod == 5) then
ismaximized = true
end
for index, _table in _ipairs (totais) do
if (_table [2] > 0 and (index < 3 or keydown == "alt")) then
if (_table [2] > 0 and (index < 3 or ismaximized)) then
if (not added_logo) then
added_logo = true
@@ -1098,7 +1113,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
GameCooltip:AddIcon ([[Interface\COMMON\friendship-heart]], 1, 1, 14, 14, 0.21875, 0.78125, 0.09375, 0.6875)
if (keydown == "alt") then
if (ismaximized) then
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_alt]], 1, 2, 24, 12, 0, 1, 0, 0.640625, key_overlay_press)
GameCooltip:AddStatusBar (100, 1, r, g, b, 1)
else
@@ -1110,11 +1125,11 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
local n = _table [1]:gsub (("%s%<.*"), "")
if (instancia.sub_atributo == 2) then
GameCooltip:AddLine (n, _detalhes:comma_value ( _math_floor (_table [3])) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
GameCooltip:AddLine (n, FormatTooltipNumber (_, _math_floor (_table [3])) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
else
GameCooltip:AddLine (n, _detalhes:comma_value (_table [2]) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
GameCooltip:AddLine (n, FormatTooltipNumber (_, _table [2]) .. " (" .. _math_floor (_table [2]/self.total*100) .. "%)")
end
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
_detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\classes_small]], 1, 1, 14, 14, 0.25, 0.49609375, 0.75, 1)
end
end
@@ -1817,6 +1832,8 @@ end
--> atualize a funcao de abreviacao
function atributo_heal:UpdateSelectedToKFunction()
SelectedToKFunction = ToKFunctions [_detalhes.ps_abbreviation]
FormatTooltipNumber = ToKFunctions [_detalhes.tooltip.abbreviation]
TooltipMaximizedMethod = _detalhes.tooltip.maximize_method
end
--> subtract total from a combat table
classes/classe_instancia.lua
+3
View File
@@ -941,6 +941,9 @@ end
--local skin = fazer aqui o esquema de resgatar a skin salva no profile.
new_instance:ChangeSkin ("Minimalistic")
new_instance:ChangeSkin ("Default Skin")
--> apply standard skin if have one saved
if (_detalhes.standard_skin) then
classes/classe_instancia_include.lua
+17 -11
View File
@@ -48,8 +48,6 @@ _detalhes.instance_defaults = {
--show bottom statusbar
show_statusbar = true,
statusbar_info = {alpha = 1, overlay = {1, 1, 1}},
--blackwhiite icons
desaturated_menu = false,
--hide main window attribute icon
hide_icon = false,
--anchor side of main window toolbar (1 = top 2 = bottom)
@@ -65,24 +63,32 @@ _detalhes.instance_defaults = {
--sort direction is the direction of results on bars (1 = top to bottom 2 = bottom to top)
bars_sort_direction = 1,
--reset button info
resetbutton_info = {text_color = {1, 0.82, 0, 1}, text_color_small = {1, 0.82, 0, 1}, text_face = "Friz Quadrata TT", text_size = 12, color_overlay = {1, 1, 1, 1}, always_small = false},
resetbutton_config = {size = {10, 16}, anchor = {2, 0}, normal_texture = [[Interface\Addons\Details\Images\reset_button]], highlight_texture = [[Interface\Addons\Details\Images\reset_button]], normal_texcoord = {0, 1, 0, 1}, highlight_texcoord = {0, 1, 0, 1}, normal_vertexcolor = {1, 1, 1, 1}, highlight_vertexcolor = {1, 1, 1, 1}},
--instance button info
instancebutton_info = {text_color = {1, 0.82, 0, 1}, text_face = "Friz Quadrata TT", text_size = 12, color_overlay = {1, 1, 1, 1}},
instancebutton_config = {size = {20, 16}, anchor = {2, 0}, highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]], textcolor = {1, 1, 1, 1}, textsize = 11, textfont = "Friz Quadrata TT", textshadow = false},
--close button info
closebutton_info = {color_overlay = {1, 1, 1, 1}},
closebutton_config = {size = {18, 18}, anchor = {0, 0}, normal_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Up]], highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]], pushed_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Down]]},
--menus:
--anchor store the anchor point of main menu
menu_anchor = {5, 1, side = 1},
menu_anchor = {5, 1, side = 1}, --mode segment attribute report on top position
menu_anchor_down = {5, 1}, --mode segment attribute report on bottom position
menu2_anchor = {14, 3}, --close instance erase on top position
menu2_anchor_down = {14, 3}, --close instance erase on bottom position
--blackwhiite icons
desaturated_menu = false, --mode segment attribute report
desaturated_menu2 = false, --reset instance close
--icons on menu
menu_icons = {true, true, true, true},
menu_icons = {true, true, true, true}, --mode segment attribute report
menu2_icons = {true, true, true}, --reset instance close
--menu icons size multiplicator factor
menu_icons_size = 1.0,
--auto hide window borders
menu_alpha = {enabled = false, iconstoo = true, onenter = 1, onleave = 1, ignorebars = false},
--auto hide menu
menu_icons_size = 1.0, --mode segment attribute report
menu2_icons_size = 1.0, --reset instance close
--auto hide menu buttons
auto_hide_menu = {left = false, right = false},
--attribute text
attribute_text = {enabled = false, anchor = {5, 1}, text_face = "Friz Quadrata TT", text_size = 12, text_color = {1, 1, 1, 1}, side = 1, shadow = false},
--auto hide window borders statusbar main menu
menu_alpha = {enabled = false, iconstoo = true, onenter = 1, onleave = 1, ignorebars = false},
--instance button anchor store the anchor point of instance and delete button
instance_button_anchor = {-27, 1},
--total bar
classes/classe_others.lua
+23 -18
View File
@@ -65,6 +65,9 @@ local ToKFunctions = _detalhes.ToKFunctions
local SelectedToKFunction = ToKFunctions [1]
local UsingCustomRightText = false
local FormatTooltipNumber = ToKFunctions [8]
local TooltipMaximizedMethod = 1
local info = _detalhes.janela_info
local keyName
@@ -152,7 +155,7 @@ function atributo_misc:NovaTabela (serial, nome, link)
return _new_miscActor
end
function _detalhes:ToolTipDead (instancia, morte, esta_barra)
function _detalhes:ToolTipDead (instancia, morte, esta_barra, keydown)
local eventos = morte [1]
local hora_da_morte = morte [2]
@@ -835,35 +838,35 @@ end
---------> TOOLTIPS BIFURCAÇÃO
function atributo_misc:ToolTip (instancia, numero, barra)
function atributo_misc:ToolTip (instancia, numero, barra, keydown)
--> seria possivel aqui colocar o icone da classe dele?
GameTooltip:ClearLines()
GameTooltip:AddLine (barra.colocacao..". "..self.nome)
if (instancia.sub_atributo == 3) then --> interrupt
return self:ToolTipInterrupt (instancia, numero, barra)
return self:ToolTipInterrupt (instancia, numero, barra, keydown)
elseif (instancia.sub_atributo == 1) then --> cc_break
return self:ToolTipCC (instancia, numero, barra)
return self:ToolTipCC (instancia, numero, barra, keydown)
elseif (instancia.sub_atributo == 2) then --> ress
return self:ToolTipRess (instancia, numero, barra)
return self:ToolTipRess (instancia, numero, barra, keydown)
elseif (instancia.sub_atributo == 4) then --> dispell
return self:ToolTipDispell (instancia, numero, barra)
return self:ToolTipDispell (instancia, numero, barra, keydown)
elseif (instancia.sub_atributo == 5) then --> mortes
return self:ToolTipDead (instancia, numero, barra)
return self:ToolTipDead (instancia, numero, barra, keydown)
elseif (instancia.sub_atributo == 6) then --> defensive cooldowns
return self:ToolTipDefensiveCooldowns (instancia, numero, barra)
return self:ToolTipDefensiveCooldowns (instancia, numero, barra, keydown)
elseif (instancia.sub_atributo == 7) then --> buff uptime
return self:ToolTipBuffUptime (instancia, numero, barra)
return self:ToolTipBuffUptime (instancia, numero, barra, keydown)
elseif (instancia.sub_atributo == 8) then --> debuff uptime
return self:ToolTipDebuffUptime (instancia, numero, barra)
return self:ToolTipDebuffUptime (instancia, numero, barra, keydown)
end
end
--> tooltip locals
local r, g, b
local headerColor = "yellow"
local barAlha = .6
function atributo_misc:ToolTipDead (instancia, numero, barra)
local last_dead = self.dead_log [#self.dead_log]
@@ -951,7 +954,7 @@ function atributo_misc:ToolTipDispell (instancia, numero, barra)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
if (#meus_dispells > 0) then
for i = 1, _math_min (3, #meus_dispells) do
for i = 1, _math_min (25, #meus_dispells) do
local esta_habilidade = meus_dispells[i]
local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1])
GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)")
@@ -974,7 +977,7 @@ function atributo_misc:ToolTipDispell (instancia, numero, barra)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
if (#buffs_dispelados > 0) then
for i = 1, _math_min (3, #buffs_dispelados) do
for i = 1, _math_min (25, #buffs_dispelados) do
local esta_habilidade = buffs_dispelados[i]
local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1])
GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)")
@@ -993,7 +996,7 @@ function atributo_misc:ToolTipDispell (instancia, numero, barra)
end
_table_sort (alvos_dispelados, _detalhes.Sort2)
for i = 1, _math_min (3, #alvos_dispelados) do
for i = 1, _math_min (25, #alvos_dispelados) do
if (alvos_dispelados[i][2] < 1) then
break
end
@@ -1365,7 +1368,7 @@ function atributo_misc:ToolTipDefensiveCooldowns (instancia, numero, barra)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
if (#cooldowns_usados > 0) then
for i = 1, _math_min (15, #cooldowns_usados) do
for i = 1, _math_min (25, #cooldowns_usados) do
local esta_habilidade = cooldowns_usados[i]
local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1])
GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)")
@@ -1390,7 +1393,7 @@ function atributo_misc:ToolTipDefensiveCooldowns (instancia, numero, barra)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
if (#alvos > 0) then
for i = 1, _math_min (3, #alvos) do
for i = 1, _math_min (25, #alvos) do
GameCooltip:AddLine (alvos[i][1]..": ", alvos[i][2], 1, "white", "white")
GameCooltip:AddStatusBar (100, 1, .1, .1, .1, .3)
@@ -1517,7 +1520,7 @@ function atributo_misc:ToolTipInterrupt (instancia, numero, barra)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
if (#meus_interrupts > 0) then
for i = 1, _math_min (3, #meus_interrupts) do
for i = 1, _math_min (25, #meus_interrupts) do
local esta_habilidade = meus_interrupts[i]
local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1])
GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)")
@@ -1541,7 +1544,7 @@ function atributo_misc:ToolTipInterrupt (instancia, numero, barra)
GameCooltip:AddStatusBar (100, 1, r, g, b, barAlha)
if (#habilidades_interrompidas > 0) then
for i = 1, _math_min (3, #habilidades_interrompidas) do
for i = 1, _math_min (25, #habilidades_interrompidas) do
local esta_habilidade = habilidades_interrompidas[i]
local nome_magia, _, icone_magia = _GetSpellInfo (esta_habilidade[1])
GameCooltip:AddLine (nome_magia..": ", esta_habilidade[2].." (".._cstr("%.1f", esta_habilidade[2]/meu_total*100).."%)")
@@ -1863,6 +1866,8 @@ end
--> atualize a funcao de abreviacao
function atributo_misc:UpdateSelectedToKFunction()
SelectedToKFunction = ToKFunctions [_detalhes.ps_abbreviation]
FormatTooltipNumber = ToKFunctions [_detalhes.tooltip.abbreviation]
TooltipMaximizedMethod = _detalhes.tooltip.maximize_method
end
core/control.lua
+20 -7
View File
@@ -8,6 +8,7 @@
local _detalhes = _G._detalhes
local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" )
local SharedMedia = LibStub:GetLibrary("LibSharedMedia-3.0")
local _tempo = time()
local _
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -553,7 +554,6 @@
if (_detalhes.SoloTables.CombatIDLast and _detalhes.SoloTables.CombatIDLast ~= 0) then --> volta os dados da luta anterior
_detalhes.SoloTables.CombatID = _detalhes.SoloTables.CombatIDLast
_detalhes:RefreshSolo()
else
_detalhes:RefreshSolo()
@@ -900,11 +900,23 @@
local avatarPoint = {"bottomleft", "topleft", -3, -4}
local backgroundPoint = {{"bottomleft", "topleft", 0, -3}, {"bottomright", "topright", 0, -3}}
local textPoint = {"left", "right", -11, -5}
local avatarTexCoord = {0, 1, 0, 1}
function _detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddStatusBar (100, 1, unpack (_detalhes.tooltip.background))
end
function _detalhes:MontaTooltip (frame, qual_barra, keydown)
local GameCooltip = GameCooltip
GameCooltip:Reset()
GameCooltip:SetType ("tooltip")
GameCooltip:SetOption ("TextSize", _detalhes.tooltip.fontsize)
GameCooltip:SetOption ("TextFont", _detalhes.tooltip.fontface)
GameCooltip:SetOption ("TextColor", _detalhes.tooltip.fontcolor)
GameCooltip:SetOption ("TextShadow", _detalhes.tooltip.fontshadow and "OUTLINE")
GameCooltip:SetOption ("LeftBorderSize", -5)
GameCooltip:SetOption ("RightBorderSize", 5)
GameCooltip:SetOption ("MinWidth", 180)
@@ -919,21 +931,22 @@
--verifica por tooltips especiais:
if (objeto.dead) then --> é uma barra de dead
return _detalhes:ToolTipDead (self, objeto, esta_barra) --> instância, [morte], barra
return _detalhes:ToolTipDead (self, objeto, esta_barra, keydown) --> instância, [morte], barra
elseif (objeto.frags) then
return _detalhes:ToolTipFrags (self, objeto, esta_barra)
return _detalhes:ToolTipFrags (self, objeto, esta_barra, keydown)
elseif (objeto.boss_debuff) then
return _detalhes:ToolTipVoidZones (self, objeto, esta_barra)
return _detalhes:ToolTipVoidZones (self, objeto, esta_barra, keydown)
end
local t = objeto:ToolTip (self, qual_barra, esta_barra, keydown) --> instância, nº barra, objeto barra, keydown
if (t) then
if (esta_barra.minha_tabela.serial and esta_barra.minha_tabela.serial ~= "") then
local avatar = NickTag:GetNicknameTable (esta_barra.minha_tabela.serial)
if (avatar) then
if (avatar [2]) then
GameCooltip:SetBannerImage (1, avatar [2], 80, 40, avatarPoint, nil, nil) --> overlay [2] avatar path
GameCooltip:SetBannerImage (1, avatar [2], 80, 40, avatarPoint, avatarTexCoord, nil) --> overlay [2] avatar path
end
if (avatar [4]) then
GameCooltip:SetBannerImage (2, avatar [4], 200, 55, backgroundPoint, avatar [5], avatar [6]) --> background
@@ -944,7 +957,7 @@
end
end
return GameCooltip:ShowCooltip()
GameCooltip:ShowCooltip()
end
end
core/parser.lua
+2 -2
View File
@@ -627,8 +627,8 @@
--> group checks
if (este_jogador.grupo) then
_current_combat.totals_grupo[2] = _current_combat.totals_grupo[2]+amount
_overall_combat.totals_grupo[2] = _overall_combat.totals_grupo[2]+amount
_current_combat.totals_grupo[2] = _current_combat.totals_grupo[2] + cura_efetiva
_overall_combat.totals_grupo[2] = _overall_combat.totals_grupo[2] + cura_efetiva
end
if (jogador_alvo.grupo) then
core/plugins_solo.lua
+4 -18
View File
@@ -35,13 +35,6 @@
_detalhes.SoloTables.Attribute = SoloInstance.atributo
end
--> details can call a refresh for an plugin window
function _detalhes:RefreshSolo()
if (_detalhes.SoloTables.Plugins [_detalhes.SoloTables.Mode].Refresh) then
_detalhes.SoloTables.Plugins [_detalhes.SoloTables.Mode].Refresh (nil, SoloInstance)
end
end
--> enable and disable Solo Mode for an Instance
function _detalhes:SoloMode (show)
if (show) then
@@ -104,6 +97,9 @@
else
--print ("--------------------------------")
--print (debugstack())
if (_detalhes.PluginCount.SOLO > 0) then
local solo_frame = _detalhes.SoloTables.Plugins [_detalhes.SoloTables.Mode].Frame
if (solo_frame) then
@@ -152,9 +148,7 @@
_detalhes.SoloTables.SpellCastTable = {} --> not used
_detalhes.SoloTables.TimeTable = {} --> not used
_detalhes.SoloTables.Mode = _detalhes.SoloTables.Mode or 1 --> solo mode
function _detalhes.SoloTables:GetActiveIndex()
@@ -203,15 +197,6 @@
return true
end
function _detalhes:SoloCastTime (spell, start, tempo)
if (start) then
_detalhes.CastStart = tempo
else
local tempoGasto = _detalhes.CastStart - tempo
_detalhes.CastStart = nil
end
end
function _detalhes:CloseSoloDebuffs()
local SoloDebuffUptime = _detalhes.tabela_vigente.SoloDebuffUptime
if (not SoloDebuffUptime) then
@@ -274,6 +259,7 @@
instancia = self
end
if (instancia.modo == modo_alone) then
--print ("arrumando a instancia "..instancia.meu_id)
if (instancia.iniciada) then
core/plugins_statusbar.lua
+14 -4
View File
@@ -190,7 +190,9 @@
_detalhes.StatusBar:SetLeftPlugin (instance, instance.StatusBar.left)
end
end
--> select a new plugin in for an instance anchor
local ChoosePlugin = function (_, _, index, current_child, anchor)
@@ -262,6 +264,14 @@
end
function _detalhes.StatusBar:SetPlugin (instance, absolute_name, anchor)
local index = _detalhes.StatusBar:GetIndexFromAbsoluteName (absolute_name)
if (index and anchor) then
anchor = string.lower (anchor)
ChoosePlugin (nil, nil, index, instance.StatusBar [anchor], anchor)
end
end
--> on enter
local onEnterCooltipTexts = {
{text = "|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:14:14:0:1:512:512:8:70:224:306|t " .. Loc ["STRING_PLUGIN_TOOLTIP_LEFTBUTTON"]},
@@ -1009,10 +1019,10 @@ do
local myframe = _detalhes.StatusBar:CreateChildFrame (instance, "DetailsClockInstance"..instance:GetInstanceId(), DEFAULT_CHILD_WIDTH, DEFAULT_CHILD_HEIGHT)
--> we place custom frame, widgets inside this function
local texture = myframe:CreateTexture (nil, "overlay")
texture:SetTexture ("Interface\\AddOns\\Details\\images\\clock")
texture:SetPoint ("right", myframe.text.widget, "left")
myframe.texture = texture
--local texture = myframe:CreateTexture (nil, "overlay")
--texture:SetTexture ("Interface\\AddOns\\Details\\images\\clock")
--texture:SetPoint ("right", myframe.text.widget, "left")
--myframe.texture = texture
local new_child = _detalhes.StatusBar:CreateChildTable (instance, Clock, myframe)
core/plugins_toolbar.lua
-3
View File
@@ -195,9 +195,6 @@
local instance = _detalhes:GetInstance (lower_instance)
_detalhes:ResetButtonSnapTo (instance)
_detalhes.ResetButtonInstance = lower_instance
if (not just_refresh) then
for _, instancia in pairs (_detalhes.tabela_instancias) do
if (instancia.baseframe and instancia:IsAtiva()) then
core/util.lua
+8 -9
View File
@@ -106,8 +106,14 @@
function _detalhes:NoToK (numero)
return numero
end
--> put points in numbers
-- thanks http://richard.warburton.it
function _detalhes:comma_value(n)
local left,num,right = _string_match (n,'^([^%d]*%d)(%d*)(.-)$')
return left..(num:reverse():gsub('(%d%d%d)','%1,'):reverse())..right
end
_detalhes.ToKFunctions = {_detalhes.NoToK, _detalhes.ToK, _detalhes.ToK2, _detalhes.ToK0, _detalhes.ToKMin, _detalhes.ToK2Min, _detalhes.ToK0Min}
_detalhes.ToKFunctions = {_detalhes.NoToK, _detalhes.ToK, _detalhes.ToK2, _detalhes.ToK0, _detalhes.ToKMin, _detalhes.ToK2Min, _detalhes.ToK0Min, _detalhes.comma_value}
function string:ReplaceData (...)
local args = {...}
@@ -170,13 +176,6 @@
return unpack (values)
end
--> put points in numbers
-- thanks http://richard.warburton.it
function _detalhes:comma_value(n)
local left,num,right = _string_match (n,'^([^%d]*%d)(%d*)(.-)$')
return left..(num:reverse():gsub('(%d%d%d)','%1,'):reverse())..right
end
--> trim thanks from http://lua-users.org/wiki/StringTrim
function _detalhes:trim (s)
local from = s:match"^%s*()"
@@ -259,6 +258,7 @@
function _detalhes:EstaEmCombate()
_detalhes:TimeDataTick()
_detalhes:BrokerTick()
if (_detalhes.zone_type == "pvp" or _InCombatLockdown()) then
return true
@@ -278,7 +278,6 @@
end
end
LastDps = 0
_detalhes:SairDoCombate()
end
core/windows.lua
+13 -20
View File
@@ -312,26 +312,6 @@
if (self.mostrando == "normal") then --> somente alterar o tamanho das barras se tiver mostrando o gump normal
if (self.meu_id == _detalhes.ResetButtonInstance) then
if (self.baseframe:GetWidth() < 215 or self.resetbutton_info.always_small) then
gump:Fade (_detalhes.ResetButton, 1)
gump:Fade (_detalhes.ResetButton2, 0)
local alpha = self:GetInstanceCurrentAlpha()
_detalhes.ResetButton2:SetAlpha (alpha)
_detalhes.ResetButtonMode = 2
else
gump:Fade (_detalhes.ResetButton, 0)
gump:Fade (_detalhes.ResetButton2, 1)
local alpha = self:GetInstanceCurrentAlpha()
_detalhes.ResetButton2:SetAlpha (alpha)
_detalhes.ResetButtonMode = 1
end
end
if (not self.baseframe.isStretching and self.stretchToo and #self.stretchToo > 0) then
if (self.eh_horizontal or self.eh_tudo or (self.verticalSnap and not self.eh_vertical)) then
for _, instancia in _ipairs (self.stretchToo) do
@@ -825,6 +805,18 @@
end
end
function f:TextConfig (fontsize, fontface, fontcolor)
for i = 1, 5 do
local line = f.lines [i]
_detalhes:SetFontSize (line, fontsize or 9)
_detalhes:SetFontFace (line, fontface or [[Fonts\FRIZQT__.TTF]])
_detalhes:SetFontColor (line, fontcolor or {.9, .9, .9, 1})
end
end
function f:SetBubbleText (line1, line2, line3, line4, line5)
if (not line1) then
for _, line in ipairs (f.lines) do
@@ -846,6 +838,7 @@
function f:SetOwner (frame, myPoint, hisPoint, x, y, alpha)
f:ClearAllPoints()
f:TextConfig()
f:SetBubbleText (nil)
t:SetTexCoord (0.7373046875, 0.9912109375, 0.6416015625, 0.7978515625)
f.isHorizontalFlipped = false
framework/cooltip.lua
+13 -3
View File
@@ -88,6 +88,7 @@ function DetailsCreateCoolTip()
["TextSize"] = true,
["TextFont"] = true,
["TextColor"] = true,
["TextShadow"] = true,
["LeftTextWidth"] = true,
["RightTextWidth"] = true,
["LeftTextHeight"] = true,
@@ -129,6 +130,7 @@ function DetailsCreateCoolTip()
["TextSize"] = nil,
["TextFont"] = nil,
["TextColor"] = nil,
["TextShadow"] = nil,
["LeftTextWidth"] = nil,
["RightTextWidth"] = nil,
["LeftTextHeight"] = nil,
@@ -636,13 +638,15 @@ function DetailsCreateCoolTip()
menuButton.leftText:SetHeight (0)
end
if (CoolTip.OptionsTable.TextFont and not leftTextTable [7]) then
if (CoolTip.OptionsTable.TextFont and not leftTextTable [7]) then --font
if (_G [CoolTip.OptionsTable.TextFont]) then
menuButton.leftText:SetFontObject (GameFontRed or CoolTip.OptionsTable.TextFont)
else
local font = SharedMedia:Fetch ("font", CoolTip.OptionsTable.TextFont)
local _, size, flags = menuButton.leftText:GetFont()
flags = leftTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
size = leftTextTable [6] or CoolTip.OptionsTable.TextSize or size
menuButton.leftText:SetFont (font, size, flags)
end
@@ -650,18 +654,20 @@ function DetailsCreateCoolTip()
if (_G [leftTextTable [7]]) then
menuButton.leftText:SetFontObject (leftTextTable [7])
local face, size, flags = menuButton.leftText:GetFont()
flags = leftTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
size = leftTextTable [6] or CoolTip.OptionsTable.TextSize or size
menuButton.leftText:SetFont (face, size, flags)
else
local font = SharedMedia:Fetch ("font", leftTextTable [7])
local face, size, flags = menuButton.leftText:GetFont()
flags = leftTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
size = leftTextTable [6] or CoolTip.OptionsTable.TextSize or size
menuButton.leftText:SetFont (face, size, flags)
end
else
size = leftTextTable [6] or CoolTip.OptionsTable.TextSize or 10
face = leftTextTable [7] or [[Fonts\FRIZQT__.TTF]]
flags = leftTextTable [8]
flags = leftTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
menuButton.leftText:SetFont (face, size, flags)
end
@@ -707,6 +713,8 @@ function DetailsCreateCoolTip()
else
local font = SharedMedia:Fetch ("font", CoolTip.OptionsTable.TextFont)
local _, size, flags = menuButton.rightText:GetFont()
flags = rightTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
size = rightTextTable [6] or CoolTip.OptionsTable.TextSize or size
menuButton.rightText:SetFont (font, size, flags)
end
@@ -714,11 +722,13 @@ function DetailsCreateCoolTip()
if (_G [rightTextTable [7]]) then
menuButton.rightText:SetFontObject (rightTextTable [7])
local face, size, flags = menuButton.rightText:GetFont()
flags = rightTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
size = rightTextTable [6] or CoolTip.OptionsTable.TextSize or size
menuButton.rightText:SetFont (face, size, flags)
else
local font = SharedMedia:Fetch ("font", rightTextTable [7])
local face, size, flags = menuButton.rightText:GetFont()
flags = rightTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
size = rightTextTable [6] or CoolTip.OptionsTable.TextSize or size
menuButton.rightText:SetFont (face, size, flags)
end
@@ -726,7 +736,7 @@ function DetailsCreateCoolTip()
else
size = rightTextTable [6] or CoolTip.OptionsTable.TextSize or 10
face = rightTextTable [7] or [[Fonts\FRIZQT__.TTF]]
flags = rightTextTable [8]
flags = rightTextTable [8] or CoolTip.OptionsTable.TextShadow or nil
menuButton.rightText:SetFont (face, size, flags)
end
framework/dropdown.lua
+111 -19
View File
@@ -278,6 +278,8 @@ local DropDownMetaFunctions = {}
------------------------------------------------------------------------------------------------------------
--> scripts
local last_opened = false
local function isOptionVisible (thisOption)
if (_type (thisOption.shown) == "boolean" or _type (thisOption.shown) == "function") then
if (not thisOption.shown) then
@@ -289,23 +291,116 @@ local function isOptionVisible (thisOption)
return true
end
function DropDownMetaFunctions:Select (optionName, byOptionNumber)
function DropDownMetaFunctions:Refresh()
local menu = self.func()
if (#menu == 0) then
self:NoOption (true)
self.no_options = true
return false
elseif (self.no_options) then
self.no_options = false
self:NoOption (false)
self:NoOptionSelected()
return true
end
return true
end
function DropDownMetaFunctions:NoOptionSelected()
self.label:SetText (self.empty_text or "no option selected")
self.label:SetTextColor (1, 1, 1, 0.4)
if (self.empty_icon) then
self.icon:SetTexture (self.empty_icon)
else
self.icon:SetTexture ([[Interface\COMMON\UI-ModelControlPanel]])
self.icon:SetTexCoord (0.625, 0.78125, 0.328125, 0.390625)
end
self.icon:SetVertexColor (1, 1, 1, 0.4)
self.last_select = nil
end
function DropDownMetaFunctions:NoOption (state)
if (state) then
self:Disable()
self:SetAlpha (0.5)
self.label:SetText ("no options")
self.label:SetTextColor (1, 1, 1, 0.4)
self.icon:SetTexture ([[Interface\CHARACTERFRAME\UI-Player-PlayTimeUnhealthy]])
self.icon:SetTexCoord (0, 1, 0, 1)
self.icon:SetVertexColor (1, 1, 1, 0.4)
else
self:Enable()
self:SetAlpha (1)
end
end
function DropDownMetaFunctions:Select (optionName, byOptionNumber)
if (type (optionName) == "boolean" and not optionName) then
self:NoOptionSelected()
return false
end
local menu = self.func()
if (#menu == 0) then
self:NoOption (true)
return true
else
self:NoOption (false)
end
if (byOptionNumber and type (optionName) == "number") then
--print ("selected", optionName)
return self:Selected (menu [optionName])
if (not menu [optionName]) then --> invalid index
self:NoOptionSelected()
return false
end
self:Selected (menu [optionName])
return true
end
for _, thisMenu in ipairs (menu) do
if (thisMenu.label == optionName and isOptionVisible (thisMenu)) then
return self:Selected (thisMenu)
self:Selected (thisMenu)
return true
end
end
return false
end
function DropDownMetaFunctions:SetEmptyTextAndIcon (text, icon)
if (text) then
self.empty_text = text
end
if (icon) then
self.empty_icon = icon
end
self:Selected (self.last_select)
end
function DropDownMetaFunctions:Selected (_table)
if (not _table) then
--> there is any options?
if (not self:Refresh()) then
self.last_select = nil
return
end
--> exists options but none selected
self:NoOptionSelected()
return
end
self.last_select = _table
self:NoOption (false)
self.label:SetText (_table.label)
self.icon:SetTexture (_table.icon)
@@ -337,9 +432,9 @@ function DropDownMetaFunctions:Selected (_table)
end
if (_table.font) then
self.label:SetFont (_table.font, 10.5)
self.label:SetFont (_table.font, 10)
else
self.label:SetFont ("GameFontHighlightSmall", 10.5)
self.label:SetFont ("GameFontHighlightSmall", 10)
end
self:SetValue (_table.value)
@@ -368,6 +463,10 @@ function DropDownMetaFunctions:Open()
self.dropdown.dropdownborder:Show()
self.dropdown.arrowTexture:SetTexture ("Interface\\Buttons\\UI-ScrollBar-ScrollDownButton-Down")
self.opened = true
if (last_opened) then
last_opened:Close()
end
last_opened = self
end
function DropDownMetaFunctions:Close()
@@ -383,6 +482,7 @@ function DropDownMetaFunctions:Close()
selectedTexture:Hide()
self.opened = false
last_opened = false
end
--> close by escape key
@@ -799,24 +899,16 @@ function gump:NewDropDown (parent, container, name, member, w, h, func, default)
_setmetatable (DropDownObject, DropDownMetaFunctions)
--> initialize first menu selected
local menu = func()
if (type (default) == "string") then
DropDownObject:Select (default)
else
for i = default, #menu do
local _table = menu [i]
if (not _table) then
break
end
if (isOptionVisible (_table)) then
DropDownObject:Selected (_table)
break
end
elseif (type (default) == "number") then
if (not DropDownObject:Select (default)) then
DropDownObject:Select (default, true)
end
end
return DropDownObject
end
framework/dropdown.xml
+5 -2
View File
@@ -30,14 +30,17 @@
<Layer level="ARTWORK">
<!-- icon texture -->
<Texture name="$parent_IconTexture" parentKey="icon" file = "Interface\ICONS\Spell_ChargePositive">
<Texture name="$parent_IconTexture" parentKey="icon" file = "Interface\COMMON\UI-ModelControlPanel">
<Color r="1" g="1" b="1" a="0.4"/>
<TexCoords left="0.625" right="0.78125" top="0.328125" bottom="0.390625"/>
<Size x="20" y="20" />
<Anchors>
<Anchor point="LEFT" relativeTo="$parent" relativePoint="LEFT" x="2" y="0"/>
</Anchors>
</Texture>
<!-- text -->
<FontString name="$parent_Text" parentKey="text" inherits="GameFontHighlightSmall" justifyH="LEFT" nonspacewrap="true">
<FontString name="$parent_Text" parentKey="text" inherits="GameFontHighlightSmall" justifyH="LEFT" nonspacewrap="true" text="no option selected">
<Color r="1" g="1" b="1" a="0.4"/>
<FontHeight val="10.5"/>
<Anchors>
<Anchor point="LEFT" relativeTo="$parent_IconTexture" relativePoint="RIGHT" x="5" y="0"/>
framework/panel.lua
+16 -12
View File
@@ -163,24 +163,28 @@ local APIFrameFunctions
--> methods
--> right click to close
function PanelMetaFunctions:CreateRightClickLabel (textType, w, h)
function PanelMetaFunctions:CreateRightClickLabel (textType, w, h, close_text)
local text
w = w or 20
h = h or 20
if (textType) then
textType = string.lower (textType)
if (textType == "short") then
text = Loc ["STRING_RIGHTCLICK_CLOSE_SHORT"]
elseif (textType == "medium") then
text = Loc ["STRING_RIGHTCLICK_CLOSE_MEDIUM"]
elseif (textType == "large") then
text = Loc ["STRING_RIGHTCLICK_CLOSE_LARGE"]
end
if (close_text) then
text = close_text
else
text = Loc ["STRING_RIGHTCLICK_CLOSE_SHORT"]
if (textType) then
textType = string.lower (textType)
if (textType == "short") then
text = Loc ["STRING_RIGHTCLICK_CLOSE_SHORT"]
elseif (textType == "medium") then
text = Loc ["STRING_RIGHTCLICK_CLOSE_MEDIUM"]
elseif (textType == "large") then
text = Loc ["STRING_RIGHTCLICK_CLOSE_LARGE"]
end
else
text = Loc ["STRING_RIGHTCLICK_CLOSE_SHORT"]
end
end
return gump:NewLabel (self, _, "$parentRightMouseToClose", nil, "|TInterface\\TUTORIALFRAME\\UI-TUTORIAL-FRAME:"..w..":"..h..":0:1:512:512:8:70:328:409|t " .. text)
end
functions/profiles.lua
+6 -6
View File
@@ -491,11 +491,11 @@ local default_profile = {
0.23, -- [3]
},
},
--> minimap
minimap = {hide = false, radius = 160, minimapPos = 220},
minimap = {hide = false, radius = 160, minimapPos = 220, onclick_what_todo = 1, text_type = 1},
--> horcorner
hotcorner_topleft = {hide = false, topleft_quick_click = true},
hotcorner_topleft = {hide = false, onclick_what_todo = 1, quickclick = true, quickclick_what_todo = 2},
--> PvP
only_pvp_frags = false,
@@ -568,9 +568,9 @@ local default_profile = {
--> skins
standard_skin = false, --?
skin = "Default Skin", --?
--> modes
--> switch
--> tooltip
tooltip = {fontface = "Friz Quadrata TT", fontsize = 10, fontcolor = {1, 1, 1, 1}, fontshadow = false, background = {.1, .1, .1, .3}, abbreviation = 8, maximize_method = 1, commands = {}},
}
functions/skins.lua
+101 -77
View File
@@ -35,6 +35,7 @@ local _
version = "1.0",
site = "unknown",
desc = "default skin for Details!",
can_change_alpha_head = false,
icon_anchor_main = {-1, 1},
icon_anchor_plugins = {-9, -7},
@@ -43,17 +44,43 @@ local _
-- the four anchors:
icon_point_anchor = {-37, 0},
left_corner_anchor = {-107, 0},
close_button_anchor = {5, -7},
right_corner_anchor = {96, 0},
icon_point_anchor_bottom = {-37, 0},
left_corner_anchor_bottom = {-107, 0},
close_button_anchor_bottom = {5, 6},
right_corner_anchor_bottom = {96, 0},
micro_frames = {left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"},
instance_cprops = {
menu_anchor = {5, 1},
hide_icon = false,
menu_anchor = {5, -1, side = 1},
menu_anchor_down = {5, -1},
menu2_anchor = {37, 10},
menu2_anchor_down = {22, -6},
menu_icons_size = 1,
plugins_grow_direction = 2,
bg_alpha = 0.5,
--instance button
instancebutton_config = {size = {22, 14}, anchor = {-2, -1}, textcolor = {.8, .6, .0, 0.8}, textsize = 10, textfont = "Friz Quadrata TT",
normal_texture = [[Interface\AddOns\Details\images\skins\default_skin]],
normal_texcoord = {0.0087890625, 0.0322265625, 0.4140625, 0.4296875},
highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]],
pushed_texture = [[Interface\AddOns\Details\images\skins\default_skin]],
pushed_texcoord = {0.0673828125, 0.0908203125, 0.4140625, 0.4296875}
},
--reset button
resetbutton_config = {size = {22, 14}, anchor = {1, 0},
normal_texture = [[Interface\AddOns\Details\images\skins\default_skin]],
normal_texcoord = {0.0380859375, 0.0615234375, 0.4140625, 0.4296875},
highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]],
pushed_texture = [[Interface\AddOns\Details\images\skins\default_skin]],
pushed_texcoord = {0.0966796875, 0.1201171875, 0.4140625, 0.4296875}
},
--close button
closebutton_config = {size = {32, 32}},
}
})
@@ -72,51 +99,45 @@ local _
icon_anchor_plugins = {-7, -13},
icon_plugins_size = {19, 18},
-- the four anchors:
--anchors:
icon_point_anchor = {-37, 0},
left_corner_anchor = {-107, 0},
close_button_anchor = {4, -3},
right_corner_anchor = {96, 0},
icon_point_anchor_bottom = {-37, 12},
left_corner_anchor_bottom = {-107, 0},
close_button_anchor_bottom = {5, 3},
right_corner_anchor_bottom = {96, 0},
close_button_size = {24, 24},
--reset button
reset_button_coords = {0.01904296875, 0.0673828125, 0.50244140625, 0.51708984375},
reset_button_small_coords = {0.11669921875, 0.13720703125, 0.50244140625, 0.51708984375},
--instance button
instance_button_coords = {0.01904296875, 0.04736328125, 0.48388671875, 0.49853515625},
--overwrites
instance_cprops = {
hide_icon = true,
menu_anchor = {-81, 2, side = 2},
instance_button_anchor = {-12, 3},
instancebutton_info = {text_color = {.8, .6, .0, 0.8}, text_face = "Friz Quadrata TT", text_size = 10, color_overlay = {1, 1, 1, 1}},
resetbutton_info = {text_color = {.8, .8, .8, 0.8}, text_color_small = {0, 0, 0, 0}, text_face = "Friz Quadrata TT", text_size = 12, color_overlay = {1, 1, 1, 1}, always_small = true},
menu_anchor = {-55, -1, side = 2},
menu_anchor_down = {-55, -1},
menu2_anchor = {32, 2},
menu2_anchor_down = {32, 2},
menu_icons_size = 0.8,
plugins_grow_direction = 1,
instancebutton_config = {size = {20, 16}, anchor = {5, 0}, textcolor = {.8, .6, .0, 0.8}, textsize = 10, textfont = "Friz Quadrata TT", highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]]},
resetbutton_config = {size = {8, 16}, anchor = {1, 0}},
closebutton_config = {size = {17, 17}},
show_sidebars = false,
show_statusbar = false,
color = {.3, .3, .3, 1},
bg_alpha = 0.2,
plugins_grow_direction = 1,
row_info = {
texture = "Blizzard Character Skills Bar",
font_face = "Arial Narrow",
},
attribute_text = {enabled = true, side = 1, text_size = 12, anchor = {-18, 4}, text_color = {1, 1, 1, 1}, text_face = "Arial Narrow"},
attribute_text = {enabled = true, side = 1, text_size = 11, anchor = {-18, 3}, text_color = {1, 1, 1, 1}, text_face = "Arial Narrow"},
},
callback = function (skin, instance, just_updating)
DetailsResetButton2Text2:SetText ("")
if (not just_updating and not instance:IsLowerInstance()) then
instance:MenuAnchor (-64)
end
--none
end,
})
@@ -128,9 +149,10 @@ local _
site = "unknown",
desc = "a simple skin with opaque colors.",
micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10},
micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10, left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"},
can_change_alpha_head = true,
icon_anchor_main = {-1, -5},
icon_anchor_plugins = {-7, -13},
icon_plugins_size = {19, 18},
@@ -138,19 +160,33 @@ local _
-- the four anchors:
icon_point_anchor = {-37, 0},
left_corner_anchor = {-107, 0},
close_button_anchor = {3, -5},
right_corner_anchor = {96, 0},
icon_point_anchor_bottom = {-37, 12},
left_corner_anchor_bottom = {-107, 0},
close_button_anchor_bottom = {5, 6},
right_corner_anchor_bottom = {96, 0},
close_button_size = {26, 26},
instance_cprops = {
resetbutton_info = {always_small = true},
instance_button_anchor = {-19, 1},
row_info = {
textL_outline = false,
textR_outline = false,
texture = "Blizzard Character Skills Bar",
texture_background = "Details Serenity",
texture_background_class_color = false,
fixed_texture_background_color = {0, 0, 0, .2},
},
menu_anchor = {2, -2, side = 1},
menu_anchor_down = {2, -4},
menu2_anchor = {32, 2},
menu2_anchor_down = {32, 2},
instancebutton_config = {size = {20, 16}, anchor = {5, 1}, textcolor = {.9, .9, .9, 1}, textsize = 10, textfont = "Friz Quadrata TT", highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]]},
resetbutton_config = {size = {8, 16}, anchor = {1, -1}},
bg_alpha = 0.3,
}
})
@@ -174,30 +210,16 @@ local _
icon_plugins_size = {19, 18},
--micro frames
micro_frames = {color = {.7, .7, .7, 1}, font = "Arial Narrow", size = 11},
--reset button
reset_button_coords = {0.01904296875, 0.0673828125, 0.50244140625, 0.51708984375},
reset_button_small_coords = {0.11669921875, 0.13720703125, 0.50244140625, 0.51708984375},
reset_button_small_size = {14, 12},
--instance button
instance_button_coords = {0.01904296875, 0.04736328125, 0.48388671875, 0.49853515625},
--close button
close_button_coords = {0.01904296875, 0.03369140625, 0.52197265625, 0.53662109375},
close_button_size = {18, 18},
micro_frames = {color = {.7, .7, .7, 1}, font = "Arial Narrow", size = 11, left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"},
-- the four anchors (for when the toolbar is on the top side)
icon_point_anchor = {-37, 0},
left_corner_anchor = {-107, 0},
close_button_anchor = {-2, 0},
right_corner_anchor = {96, 0},
-- the four anchors (for when the toolbar is on the bottom side)
icon_point_anchor_bottom = {-37, 12},
left_corner_anchor_bottom = {-107, 0},
close_button_anchor_bottom = {-2, 0},
right_corner_anchor_bottom = {96, 0},
--[[ callback function execute after all changes on the window, first argument is this skin table, second is the instance where the skin was applied --]]
@@ -221,17 +243,23 @@ local _
texture_background_class_color = false,
fixed_texture_background_color = {0, 0, 0, .2},
},
resetbutton_info = {text_color = {0.7, 0.7, 0.7, 1}, text_color_small = {0, 0, 0, 0}, text_face = "Friz Quadrata TT", text_size = 12, color_overlay = {1, 1, 1, 1}},
instancebutton_info = {text_color = {.7, .7, .7, 1}, text_face = "Friz Quadrata TT", text_size = 12, color_overlay = {1, 1, 1, 1}},
menu_anchor = {-18, 1},
instance_button_anchor = {-27, 3},
instancebutton_config = {size = {20, 16}, anchor = {5, 0}, textcolor = {.7, .7, .7, 1}, textsize = 10, textfont = "Friz Quadrata TT", highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]]},
resetbutton_config = {size = {8, 16}, anchor = {1, 0}},
closebutton_config = {size = {22, 22}},
menu_anchor = {-19, -1, side = 1},
menu_anchor_down = {-58, 0},
menu2_anchor = {32, 5},
menu2_anchor_down = {32, 2},
hide_icon = true,
bg_alpha = 0.3,
wallpaper = {
enabled = true,
width = 244.0000362689358,
height = 96.00000674770899,
texcoord = {0.001000000014901161, 0.3424842834472656, 0.5739999771118164, 1},
texcoord = {0.001000000014901161, 0.3424842834472656, 1, 0.5739999771118164},
overlay = {0, 0, 0, 0.498038113117218},
anchor = "all",
alpha = 0.4980392451398075,
@@ -384,32 +412,14 @@ local _
--micro frames
micro_frames = {color = {0.525490, 0.525490, 0.525490, 1}, font = "Arial Narrow", size = 11},
--reset button
reset_button_coords = {0.01904296875, 0.0673828125, 0.50244140625, 0.51708984375},
--reset_button_small_coords = {0.11669921875, 0.13720703125, 0.50244140625, 0.51708984375},
reset_button_small_coords = {0.1162109375, 0.13671875, 0.50390625, 0.5146484375+0.00048828125+0.00048828125}, -- 119 516 140 527
reset_button_small_size = {22, 12},
--instance button
--instance_button_coords = {0.01904296875, 0.04736328125, 0.48388671875, 0.49853515625},
instance_button_coords = {0.0185546875, 0.046875+0.00048828125, 0.4833984375, 0.498046875+0.00048828125},--19 495 48 510
instance_button_size = 12,
--0.00048828125
--close button
close_button_coords = {0.01904296875, 0.03369140625, 0.52197265625, 0.53662109375},
close_button_size = {18, 18},
reset_button_small_size = {22, 15},
-- the four anchors (for when the toolbar is on the top side)
icon_point_anchor = {-35, -0.5},
left_corner_anchor = {-107, 0},
close_button_anchor = {-2, 0},
right_corner_anchor = {96, 0},
-- the four anchors (for when the toolbar is on the bottom side)
icon_point_anchor_bottom = {-37, 12},
left_corner_anchor_bottom = {-107, 0},
close_button_anchor_bottom = {-2, 0},
right_corner_anchor_bottom = {96, 0},
--[[ callback function execute after all changes on the window, first argument is this skin table, second is the instance where the skin was applied --]]
@@ -423,13 +433,27 @@ 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 = {
resetbutton_info = {text_color = {0.7, 0.7, 0.7, 1}, text_color_small = {0, 0, 0, 0}, text_face = "Friz Quadrata TT", text_size = 12, color_overlay = {1, 1, 1, 1}, always_small = true},
instancebutton_info = {text_color = {.7, .7, .7, 1}, text_face = "Friz Quadrata TT", text_size = 12, color_overlay = {1, 1, 1, 1}},
menu_anchor = {-20, 1},
instance_button_anchor = {-17, 3},
instancebutton_config = {size = {20, 16}, anchor = {5, 0}, textcolor = {.7, .7, .7, 1}, textsize = 10, textfont = "Friz Quadrata TT", highlight_texture = [[Interface\Buttons\UI-Panel-MinimizeButton-Highlight]]},
resetbutton_config = {size = {8, 16}, anchor = {1, 0}},
closebutton_config = {size = {17, 17}},
menu_icons_size = 0.85,
menu_anchor = {-58, 0, side = 2},
menu_anchor_down = {-58, 0},
menu2_anchor = {32, 2},
menu2_anchor_down = {32, 2},
plugins_grow_direction = 1,
attribute_text = {enabled = true, anchor = {-20, 4}, text_face = "Friz Quadrata TT", text_size = 10, text_color = {1, 1, 1, .7}, side = 1, shadow = true},
hide_icon = true,
desaturated_menu = true,
desaturated_menu2 = true,
bg_alpha = 0.3,
show_statusbar = false,
row_info = {
texture = "Details Serenity",
texture_class_colors = true,
@@ -447,7 +471,7 @@ local _
enabled = true,
anchor = "all",
height = 89.00001440917025,
alpha = 0.6,
alpha = 0.8,
texture = "Interface\\Glues\\CREDITS\\Badlands3",
}
}
functions/timedata.lua
+20
View File
@@ -223,4 +223,24 @@
end
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> broker dps stuff
function _detalhes:BrokerTick()
local texttype = _detalhes.minimap.text_type
if (texttype == 1) then --dps
_detalhes.databroker.text = _detalhes.tabela_vigente.totals_grupo[1]
elseif (texttype == 2) then --hps
_detalhes.databroker.text = _detalhes.tabela_vigente.totals_grupo[2]
else
if (_detalhes.minimap.text_func) then
_detalhes.databroker.text = _detalhes.minimap.text_func()
else
_detalhes.databroker.text = 0
end
end
end
gumps/fw_mods.lua
+1 -1
View File
@@ -45,7 +45,7 @@ function gump:NewDetailsButton (parent, container, instancia, func, param1, para
w = w or 16
h = h or 16
options = options or {}
local new_button = CreateFrame ("Button", FrameName, parent)
new_button:SetWidth (w)
new_button:SetHeight (h)
gumps/janela_custom.lua
+6 -6
View File
@@ -61,7 +61,7 @@ local function CreateCustomWindow()
frame.fundo:SetTexture ("Interface\\AddOns\\Details\\images\\custom_bg")
frame.fundo:SetPoint ("topleft", frame, "topleft")
frame.move = gump:NewDetailsButton (frame, frame, _, function() end, nil, nil, 1, 1, "", "", "", "")
frame.move = gump:NewDetailsButton (frame, frame, _, function() end, nil, nil, 1, 1, "", "", "", "", nil, "DetailsCustomPanelMoveFrame")
frame.move:SetPoint ("topleft", frame, "topleft")
frame.move:SetPoint ("bottomright", frame, "bottomright")
frame.move:SetFrameLevel (frame:GetFrameLevel()+1)
@@ -162,7 +162,7 @@ local function CreateCustomWindow()
LeftButtons:SetDrawLayer ("overlay", 4)
--> botão de deletar um custom
local DeleteButton = gump:NewDetailsButton (frame, frame, _, function()end, nil, nil, 60, 15, "", "", "", "")
local DeleteButton = gump:NewDetailsButton (frame, frame, _, function()end, nil, nil, 60, 15, "", "", "", "", nil, "DetailsCustomPanelDeleteButton")
DeleteButton.text:SetText (Loc ["STRING_CUSTOM_REMOVE"])
DeleteButton.text:SetJustifyH ("left")
DeleteButton.text:SetPoint ("left", DeleteButton, "left", 0, -1)
@@ -180,7 +180,7 @@ local function CreateCustomWindow()
removeTexture:SetDrawLayer ("overlay", 3)
--> botão de dar broadcast em um custom
local BroadcastButton = gump:NewDetailsButton (frame, frame, _, function()end, nil, nil, 60, 15, "", "", "", "")
local BroadcastButton = gump:NewDetailsButton (frame, frame, _, function()end, nil, nil, 60, 15, "", "", "", "", nil, "DetailsCustomPanelBroadcastButton")
BroadcastButton.text:SetText (Loc ["STRING_CUSTOM_BROADCAST"])
BroadcastButton.text:SetJustifyH ("left")
BroadcastButton.text:SetPoint ("left", BroadcastButton, "left", 0, -1)
@@ -247,7 +247,7 @@ local function CreateCustomWindow()
for i = 1, 4 do
local button = gump:NewDetailsButton (frame, frame, _, MainMenu, i, nil, 120, 15, "", "", "", "")
local button = gump:NewDetailsButton (frame, frame, _, MainMenu, i, nil, 120, 15, "", "", "", "", nil, "DetailsCustomPanelAttributeButton"..i)
button.MouseOnEnterHook = OnEnterHook
button.MouseOnLeaveHook = OnLeaveHook
@@ -839,7 +839,7 @@ local function CreateCustomWindow()
reset()
end
local IconButton = gump:NewDetailsButton (frame, frame, _, ChooseIcon, nil, nil, 80, 15, "", "", "", "")
local IconButton = gump:NewDetailsButton (frame, frame, _, ChooseIcon, nil, nil, 80, 15, "", "", "", "", nil, "DetailsCustomPanelIconButton")
IconButton.text:SetText (Loc ["STRING_CUSTOM_ICON"])
IconButton.text:SetPoint ("left", IconButton, "left", 3, 0)
IconButton:SetPoint ("topleft", frame, "topleft", xStart+21, -118)
@@ -854,7 +854,7 @@ local function CreateCustomWindow()
Icon:SetHeight (22)
frame.icon = Icon
local CreateButton = gump:NewDetailsButton (frame, frame, _, CreateFunction, nil, nil, 80, 15, "", "", "", "")
local CreateButton = gump:NewDetailsButton (frame, frame, _, CreateFunction, nil, nil, 80, 15, "", "", "", "", nil, "DetailsCustomPanelCreateButton")
CreateButton.text:SetText (Loc ["STRING_CUSTOM_CREATE"])
CreateButton:SetPoint ("topleft", frame, "topleft", 413, -118)
CreateButton:SetFrameLevel (frame:GetFrameLevel()+2)
gumps/janela_info.lua
+10 -9
View File
@@ -430,7 +430,7 @@ function gump:CriaDetalheInfo (index)
info.bg.reportar = gump:NewDetailsButton (info.bg, nil, nil, _detalhes.Reportar, _detalhes.janela_info, 10+index, 16, 16,
--_detalhes.icones.report.up, _detalhes.icones.report.down, _detalhes.icones.report.disabled)
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON")
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", nil, "DetailsJanelaInfoReport1")
info.bg.reportar:SetPoint ("BOTTOMLEFT", info.bg.overlay, "BOTTOMRIGHT", -33, 10)
gump:Fade (info.bg.reportar, 1)
@@ -737,9 +737,7 @@ function gump:CriaJanelaInfo()
--> fehcar com o esc
tinsert (UISpecialFrames, este_gump:GetName())
--> propriedades da janela
este_gump:SetPoint ("CENTER", UIParent)
--este_gump:SetWidth (640)
@@ -774,10 +772,13 @@ function gump:CriaJanelaInfo()
este_gump.bg1:SetPoint ("TOPLEFT", este_gump, "TOPLEFT", 0, 0)
--este_gump.bg1:SetWidth (512)
--este_gump.bg1:SetHeight (256)
este_gump.bg1:SetTexture ("Interface\\AddOns\\Details\\images\\info_bg_part1")
este_gump.bg1:SetTexture ("Interface\\AddOns\\Details\\images\\info_window_background")
este_gump.bg1:SetDrawLayer ("BORDER", 1)
function _detalhes:SetPlayerDetailsWindowTexture (texture)
este_gump.bg1:SetTexture (texture)
end
_detalhes:SetPlayerDetailsWindowTexture ("Interface\\AddOns\\Details\\images\\info_window_background")
este_gump.bg1_sec_texture = este_gump:CreateTexture (nil, "BORDER")
este_gump.bg1_sec_texture:SetDrawLayer ("BORDER", 2)
este_gump.bg1_sec_texture:SetPoint ("topleft", este_gump.bg1, "topleft", 356, -86)
@@ -828,7 +829,7 @@ function gump:CriaJanelaInfo()
end
end
este_gump.grab = gump:NewDetailsButton (este_gump, este_gump, _, este_gump.ToFront, nil, nil, 590, 73, "", "", "", "", {OnGrab = "PassClick"})
este_gump.grab = gump:NewDetailsButton (este_gump, este_gump, _, este_gump.ToFront, nil, nil, 590, 73, "", "", "", "", {OnGrab = "PassClick"}, "DetailsJanelaInfoGrab")
este_gump.grab:SetPoint ("topleft",este_gump, "topleft")
este_gump.grab:SetFrameLevel (este_gump:GetFrameLevel()+1)
@@ -867,14 +868,14 @@ function gump:CriaJanelaInfo()
--> botão de reportar da caixa da esquerda, onde fica as barras principais
este_gump.report_esquerda = gump:NewDetailsButton (este_gump, este_gump, nil, _detalhes.Reportar, este_gump, 1, 16, 16,
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON")
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", nil, "DetailsJanelaInfoReport2")
--este_gump.report_esquerda:SetPoint ("BOTTOMLEFT", este_gump.container_barras, "TOPLEFT", 281, 3)
este_gump.report_esquerda:SetPoint ("BOTTOMLEFT", este_gump.container_barras, "TOPLEFT", 33, 3)
este_gump.report_esquerda:SetFrameLevel (este_gump:GetFrameLevel()+2)
--> botão de reportar da caixa dos alvos
este_gump.report_alvos = gump:NewDetailsButton (este_gump, este_gump, nil, _detalhes.Reportar, este_gump, 3, 16, 16,
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON")
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", nil, "DetailsJanelaInfoReport3")
este_gump.report_alvos:SetPoint ("BOTTOMRIGHT", este_gump.container_alvos, "TOPRIGHT", -2, -1)
este_gump.report_alvos:SetFrameLevel (3) --> solved inactive problem
@@ -919,7 +920,7 @@ function gump:CriaJanelaInfo()
--> botão de reportar da caixa da direita, onde estão os 5 quadrados
este_gump.report_direita = gump:NewDetailsButton (este_gump, este_gump, nil, _detalhes.Reportar, este_gump, 2, 16, 16,
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON")
"Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", "Interface\\COMMON\\VOICECHAT-ON", nil, "DetailsJanelaInfoReport4")
este_gump.report_direita:SetPoint ("TOPRIGHT", este_gump, "TOPRIGHT", -8, -57)
este_gump.report_direita:Hide()
gumps/janela_news.lua
+12 -31
View File
@@ -16,9 +16,11 @@ end
function _detalhes:CreateOrOpenNewsWindow()
local frame = _G.DetailsNewsWindow
-- /script _detalhes.OpenNewsWindow()
if (not frame) then
--> construir a janela de news
frame = CreateFrame ("frame", "DetailsNewsWindow", UIParent)
frame = CreateFrame ("frame", "DetailsNewsWindow", UIParent, "ButtonFrameTemplate")
frame:SetPoint ("center", UIParent, "center")
frame:SetFrameStrata ("HIGH")
frame:SetMovable (true)
@@ -28,31 +30,10 @@ function _detalhes:CreateOrOpenNewsWindow()
frame:SetScript ("OnMouseDown", function() frame:StartMoving() end)
frame:SetScript ("OnMouseUp", function() frame:StopMovingOrSizing() end)
--> fundo
local fundo = frame:CreateTexture (nil, "border")
fundo:SetTexture ("Interface\\Addons\\Details\\images\\whatsnew")
fundo:SetAllPoints (frame)
--> fechar
local close = CreateFrame ("Button", "DetailsNewsWindowClose", frame, "UIPanelCloseButton")
close:SetWidth (32)
close:SetHeight (32)
close:SetPoint ("bottomright", frame, "topright", 3, -40)
close:SetScript ("OnClick", function() frame:Hide() end)
--> avatar
local avatar = frame:CreateTexture (nil, "background")
avatar:SetPoint ("topleft", frame, "topleft", 5, -5)
--> titulo
local titulo = _detalhes.gump:NewLabel (frame, nil, "$parentTitle", nil, "", "GameFontHighlightLeft", 12, {227/255, 186/255, 4/255})
titulo:SetPoint ("center", frame, "center")
titulo:SetPoint ("top", frame, "top", 0, -18)
--> reinstall textura
local textura = _detalhes.gump:NewImage (frame, [[Interface\DialogFrame\DialogAlertIcon]], 64, 64, nil, nil, nil, "$parentExclamacao")
textura:SetPoint ("topleft", frame, "topleft", 60, -20)
textura:SetPoint ("topleft", frame, "topleft", 60, -10)
--> reinstall aviso
local reinstall = _detalhes.gump:NewLabel (frame, nil, "$parentReinstall", nil, "", "GameFontHighlightLeft", 10)
reinstall:SetPoint ("left", textura, "right", 2, -2)
@@ -61,10 +42,10 @@ function _detalhes:CreateOrOpenNewsWindow()
local frame_upper = CreateFrame ("scrollframe", nil, frame)
local frame_lower = CreateFrame ("frame", nil, frame_upper)
frame_lower:SetSize (380, 390)
frame_upper:SetPoint ("topleft", frame, "topleft", 85, -100)
frame_upper:SetWidth (395)
frame_upper:SetHeight (370)
frame_lower:SetSize (450, 390)
frame_upper:SetPoint ("topleft", frame, "topleft", 15, -70)
frame_upper:SetWidth (465)
frame_upper:SetHeight (400)
frame_upper:SetBackdrop({
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
tile = true, tileSize = 16,
@@ -83,7 +64,7 @@ function _detalhes:CreateOrOpenNewsWindow()
slider:SetThumbTexture (slider.thumb)
slider:SetOrientation ("vertical");
slider:SetSize (16, 369)
slider:SetSize (16, 399)
slider:SetPoint ("topleft", frame_upper, "topright")
slider:SetMinMaxValues (0, 1000)
slider:SetValue(0)
@@ -111,11 +92,11 @@ function _detalhes:CreateOrOpenNewsWindow()
texto:SetJustifyH ("left")
texto:SetJustifyV ("top")
texto:SetTextColor (1, 1, 1)
texto:SetWidth (380)
texto:SetWidth (450)
texto:SetHeight (1400)
function frame:Title (title)
titulo:SetText (title or "")
frame.TitleText:SetText (title or "")
end
function frame:Text (text)
@@ -123,7 +104,7 @@ function _detalhes:CreateOrOpenNewsWindow()
end
function frame:Icon (path)
avatar:SetTexture (path or nil)
frame.portrait:SetTexture (path or nil)
end
frame:Hide()
gumps/janela_options.lua
+927 -537
View File
File diff suppressed because it is too large Load Diff
gumps/janela_principal.lua
+325 -607
View File
File diff suppressed because it is too large Load Diff
gumps/switch.lua
+9 -4
View File
@@ -27,13 +27,14 @@ do
frame:SetBackdropBorderColor (170/255, 170/255, 170/255)
frame:SetBackdropColor (24/255, 24/255, 24/255, .8)
frame:SetFrameStrata ("HIGH")
frame:SetFrameLevel (8)
frame:SetFrameStrata ("DIALOG")
frame:SetFrameLevel (16)
function _detalhes.switch:CloseMe()
_detalhes.switch.frame:Hide()
_detalhes.switch.frame:SetBackdropColor (24/255, 24/255, 24/255, .8)
_detalhes.switch.current_instancia:StatusBarAlert (nil)
_detalhes.switch.current_instancia = nil
end
--> limitação: não tenho como pegar o base frame da instância por aqui
@@ -59,6 +60,10 @@ local right_click_texture = {[[Interface\TUTORIALFRAME\UI-TUTORIAL-FRAME]], 14,
function _detalhes.switch:ShowMe (instancia)
if (_detalhes.switch.current_instancia) then
_detalhes.switch.current_instancia:StatusBarAlert (nil)
end
_detalhes.switch.current_instancia = instancia
--_detalhes.switch.frame:SetFrameLevel (instancia.baseframe:GetFrameLevel() + 5)
@@ -282,7 +287,7 @@ function _detalhes.switch:NewSwitchButton (frame, index, x, y, rightButton)
}
local button = gump:NewDetailsButton (frame, frame, _, _detalhes.FastSwitch, nil, paramTable, 15, 15, "", "", "", "",
{rightFunc = {func = _detalhes.FastSwitch, param1 = nil, param2 = {atributo = nil, button = index}}, OnGrab = "PassClick"})
{rightFunc = {func = _detalhes.FastSwitch, param1 = nil, param2 = {atributo = nil, button = index}}, OnGrab = "PassClick"}, "DetailsSwitchPanelButton_1_"..index)
button:SetPoint ("topleft", frame, "topleft", x, -y)
button.rightButton = rightButton
@@ -308,7 +313,7 @@ function _detalhes.switch:NewSwitchButton (frame, index, x, y, rightButton)
button.line2:SetPoint ("left", button, "right", 0, -3)
local button2 = gump:NewDetailsButton (button, button, _, _detalhes.FastSwitch, nil, paramTable, 1, 1, button.line, "", "", button.line2,
{rightFunc = {func = _detalhes.switch.CloseMe, param1 = nil, param2 = nil}, OnGrab = "PassClick"})
{rightFunc = {func = _detalhes.switch.CloseMe, param1 = nil, param2 = nil}, OnGrab = "PassClick"}, "DetailsSwitchPanelButton_2_"..index)
button2:SetPoint ("topleft", button, "topright", 1, 0)
button2:SetPoint ("bottomright", button, "bottomright", 90, 0)
button.button2 = button2
images/icons.tga
BIN
View File
Binary file not shown.
images/icons2.tga
BIN
View File
Binary file not shown.
images/reset_button.tga
BIN
View File
Binary file not shown.
images/skins/default_skin.tga
BIN
View File
Binary file not shown.
images/skins/elvui.tga
BIN
View File
Binary file not shown.
images/skins/flat_skin.tga
BIN
View File
Binary file not shown.
images/whatsnew.tga
BIN
View File
Binary file not shown.
plugins/Details_EncounterDetails/Details_EncounterDetails.lua
+1 -1
View File
@@ -954,7 +954,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
for index, jogador in _ipairs (DamageContainer._ActorTable) do
--> só estou interessado nos adds, conferir pelo nome
if (adds_pool [tonumber (jogador.serial:sub(6, 10), 16)]) then
if (adds_pool [tonumber (jogador.serial:sub(6, 10), 16)] or (jogador.flag_original and bit.band (jogador.flag_original, 0x00000040) ~= 0)) then --> é um inimigo) then
local nome = jogador.nome
local tabela = {total = 0, dano_em = {}, dano_em_total = 0, damage_from = {}, damage_from_total = 0}
startup.lua
+240 -94
View File
@@ -420,6 +420,9 @@ function _G._detalhes:Start()
end
if (self.is_version_first_run) then
local enable_reset_warning = true
local lower_instance = _detalhes:GetLowerInstanceNumber()
if (lower_instance) then
lower_instance = _detalhes:GetInstance (lower_instance)
@@ -429,103 +432,89 @@ function _G._detalhes:Start()
end
_detalhes:FillUserCustomSpells()
end
--> minimap
local LDB = LibStub ("LibDataBroker-1.1", true)
local LDBIcon = LDB and LibStub ("LibDBIcon-1.0", true)
if LDB then
if (_detalhes_database.last_realversion and _detalhes_database.last_realversion < 18 and enable_reset_warning) then
--print ("Last Version:", _detalhes_database.last_version, "Last Interval Version:", _detalhes_database.last_realversion)
local minimapIcon = LDB:NewDataObject ("Details!", {
type = "launcher",
icon = [[Interface\AddOns\Details\images\minimap]],
local resetwarning_frame = CreateFrame ("FRAME", "DetailsResetConfigWarningDialog", UIParent, "ButtonFrameTemplate")
resetwarning_frame:SetFrameStrata ("LOW")
tinsert (UISpecialFrames, "DetailsResetConfigWarningDialog")
resetwarning_frame:SetPoint ("center", UIParent, "center")
resetwarning_frame:SetSize (512, 200)
resetwarning_frame.portrait:SetTexture ([[Interface\CHARACTERFRAME\TEMPORARYPORTRAIT-FEMALE-GNOME]])
resetwarning_frame:SetScript ("OnHide", function()
DetailsBubble:HideBubble()
end)
HotCornerIgnore = true,
resetwarning_frame.TitleText:SetText ("Noooooooooooo!!!")
resetwarning_frame.midtext = resetwarning_frame:CreateFontString (nil, "artwork", "GameFontNormal")
resetwarning_frame.midtext:SetText ("A pack of murlocs has attacked Details! tech center, our gnomes engineers are working on fixing the damage.\n\n If something is messed in your Details!, you can click on the 'Reset Skin' button.")
resetwarning_frame.midtext:SetPoint ("topleft", resetwarning_frame, "topleft", 10, -90)
resetwarning_frame.midtext:SetJustifyH ("center")
resetwarning_frame.midtext:SetWidth (370)
OnClick = function (self, button)
resetwarning_frame.gnoma = resetwarning_frame:CreateTexture (nil, "artwork")
resetwarning_frame.gnoma:SetPoint ("topright", resetwarning_frame, "topright", -3, -80)
resetwarning_frame.gnoma:SetTexture ("Interface\\AddOns\\Details\\images\\icons2")
resetwarning_frame.gnoma:SetSize (89*1.00, 97*1.00)
--resetwarning_frame.gnoma:SetTexCoord (0.212890625, 0.494140625, 0.798828125, 0.99609375) -- 109 409 253 510
resetwarning_frame.gnoma:SetTexCoord (0.17578125, 0.001953125, 0.59765625, 0.787109375) -- 1 306 90 403
if (button == "LeftButton") then
local lower_instance = _detalhes:GetLowerInstanceNumber()
if (not lower_instance) then
local instance = _detalhes:GetInstance (1)
_detalhes.CriarInstancia (_, _, 1)
_detalhes:OpenOptionsWindow (instance)
resetwarning_frame.close = CreateFrame ("Button", "DetailsFeedbackWindowCloseButton", resetwarning_frame, "OptionsButtonTemplate")
resetwarning_frame.close:SetPoint ("bottomleft", resetwarning_frame, "bottomleft", 8, 4)
resetwarning_frame.close:SetText ("Close")
resetwarning_frame.close:SetScript ("OnClick", function (self)
resetwarning_frame:Hide()
end)
resetwarning_frame.see_updates = CreateFrame ("Button", "DetailsResetWindowSeeUpdatesButton", resetwarning_frame, "OptionsButtonTemplate")
resetwarning_frame.see_updates:SetPoint ("bottomright", resetwarning_frame, "bottomright", -10, 4)
resetwarning_frame.see_updates:SetText ("Update Info")
resetwarning_frame.see_updates:SetScript ("OnClick", function (self)
_detalhes.OpenNewsWindow()
DetailsBubble:HideBubble()
--resetwarning_frame:Hide()
end)
resetwarning_frame.see_updates:SetWidth (130)
resetwarning_frame.reset_skin = CreateFrame ("Button", "DetailsResetWindowResetSkinButton", resetwarning_frame, "OptionsButtonTemplate")
resetwarning_frame.reset_skin:SetPoint ("right", resetwarning_frame.see_updates, "left", -10, 0)
resetwarning_frame.reset_skin:SetText ("Reset Skin")
resetwarning_frame.reset_skin:SetScript ("OnClick", function (self)
--do the reset
for index, instance in ipairs (_detalhes.tabela_instancias) do
if (not instance.iniciada) then
instance:RestauraJanela()
local skin = instance.skin
instance:ChangeSkin ("Default Skin")
instance:ChangeSkin ("Minimalistic")
instance:ChangeSkin (skin)
instance:DesativarInstancia()
else
_detalhes:OpenOptionsWindow (_detalhes:GetInstance (lower_instance))
local skin = instance.skin
instance:ChangeSkin ("Default Skin")
instance:ChangeSkin ("Minimalistic")
instance:ChangeSkin (skin)
end
elseif (button == "RightButton") then
GameTooltip:Hide()
local GameCooltip = GameCooltip
GameCooltip:Reset()
GameCooltip:SetType ("menu")
GameCooltip:SetOption ("ButtonsYMod", -5)
GameCooltip:SetOption ("HeighMod", 5)
GameCooltip:SetOption ("TextSize", 10)
--344 427 200 268 0.0009765625
--0.672851, 0.833007, 0.391601, 0.522460
GameCooltip:SetBannerImage (1, [[Interface\AddOns\Details\images\icons]], 83*.5, 68*.5, {"bottomleft", "topleft", 1, -4}, {0.672851, 0.833007, 0.391601, 0.522460}, nil)
GameCooltip:SetBannerImage (2, "Interface\\PetBattles\\Weather-Windy", 512*.35, 128*.3, {"bottomleft", "topleft", -25, -4}, {0, 1, 1, 0})
GameCooltip:SetBannerText (1, "Mini Map Menu", {"left", "right", 2, -5}, "white", 10)
--> reset
GameCooltip:AddMenu (1, _detalhes.tabela_historico.resetar, true, nil, nil, Loc ["STRING_MINIMAPMENU_RESET"], nil, true)
GameCooltip:AddIcon ([[Interface\COMMON\VOICECHAT-MUTED]], 1, 1, 14, 14)
GameCooltip:AddLine ("$div")
--> nova instancai
GameCooltip:AddMenu (1, _detalhes.CriarInstancia, true, nil, nil, Loc ["STRING_MINIMAPMENU_NEWWINDOW"], nil, true)
GameCooltip:AddIcon ([[Interface\ICONS\Spell_ChargePositive]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125)
--> reopen window 64: 0.0078125
local reopen = function()
for _, instance in ipairs (_detalhes.tabela_instancias) do
if (not instance:IsAtiva()) then
_detalhes:CriarInstancia (instance.meu_id)
return
end
end
end
GameCooltip:AddMenu (1, reopen, nil, nil, nil, Loc ["STRING_MINIMAPMENU_REOPEN"], nil, true)
GameCooltip:AddIcon ([[Interface\ICONS\Ability_Priest_VoidShift]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125)
GameCooltip:AddMenu (1, _detalhes.ReabrirTodasInstancias, true, nil, nil, Loc ["STRING_MINIMAPMENU_REOPENALL"], nil, true)
GameCooltip:AddIcon ([[Interface\ICONS\Ability_Priest_VoidShift]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125, "#ffb400")
GameCooltip:AddLine ("$div")
--> lock
GameCooltip:AddMenu (1, _detalhes.TravasInstancias, true, nil, nil, Loc ["STRING_MINIMAPMENU_LOCK"], nil, true)
GameCooltip:AddIcon ([[Interface\PetBattles\PetBattle-LockIcon]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125)
GameCooltip:AddMenu (1, _detalhes.DestravarInstancias, true, nil, nil, Loc ["STRING_MINIMAPMENU_UNLOCK"], nil, true)
GameCooltip:AddIcon ([[Interface\PetBattles\PetBattle-LockIcon]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125, "gray")
GameCooltip:SetOwner (self, "topright", "bottomleft")
GameCooltip:ShowCooltip()
end
end,
OnTooltipShow = function (tooltip)
tooltip:AddLine ("Details!", 1, 1, 1)
tooltip:AddLine (Loc ["STRING_MINIMAP_TOOLTIP1"])
tooltip:AddLine (Loc ["STRING_MINIMAP_TOOLTIP2"])
end,
})
end)
resetwarning_frame.reset_skin:SetWidth (130)
if (minimapIcon and not LDBIcon:IsRegistered ("Details!")) then
LDBIcon:Register ("Details!", minimapIcon, self.minimap)
function _detalhes:ResetWarningDialog()
DetailsResetConfigWarningDialog:Show()
DetailsBubble:SetOwner (resetwarning_frame.gnoma, "bottomright", "topleft", 30, -37, 1)
DetailsBubble:FlipHorizontal()
DetailsBubble:SetBubbleText ("", "", "WWHYYYYYYYYY!!!!", "", "")
DetailsBubble:TextConfig (14, nil, "deeppink")
DetailsBubble:ShowBubble()
end
_detalhes:ScheduleTimer ("ResetWarningDialog", 7)
end
end
--> interface menu
@@ -599,10 +588,166 @@ function _G._detalhes:Start()
_detalhes:ScheduleTimer ("FadeStartVersion", 7)
end
end
--> minimap
local LDB = LibStub ("LibDataBroker-1.1", true)
local LDBIcon = LDB and LibStub ("LibDBIcon-1.0", true)
if LDB then
local databroker = LDB:NewDataObject ("Details!", {
type = "launcher",
icon = [[Interface\AddOns\Details\images\minimap]],
text = "0",
HotCornerIgnore = true,
OnClick = function (self, button)
if (button == "LeftButton") then
--> 1 = open options panel
if (_detalhes.minimap.onclick_what_todo == 1) then
local lower_instance = _detalhes:GetLowerInstanceNumber()
if (not lower_instance) then
local instance = _detalhes:GetInstance (1)
_detalhes.CriarInstancia (_, _, 1)
_detalhes:OpenOptionsWindow (instance)
else
_detalhes:OpenOptionsWindow (_detalhes:GetInstance (lower_instance))
end
--> 2 = reset data
elseif (_detalhes.minimap.onclick_what_todo == 2) then
_detalhes.tabela_historico:resetar()
--> 3 = unknown
elseif (_detalhes.minimap.onclick_what_todo == 3) then
end
elseif (button == "RightButton") then
GameTooltip:Hide()
local GameCooltip = GameCooltip
GameCooltip:Reset()
GameCooltip:SetType ("menu")
GameCooltip:SetOption ("ButtonsYMod", -5)
GameCooltip:SetOption ("HeighMod", 5)
GameCooltip:SetOption ("TextSize", 10)
--344 427 200 268 0.0009765625
--0.672851, 0.833007, 0.391601, 0.522460
GameCooltip:SetBannerImage (1, [[Interface\AddOns\Details\images\icons]], 83*.5, 68*.5, {"bottomleft", "topleft", 1, -4}, {0.672851, 0.833007, 0.391601, 0.522460}, nil)
GameCooltip:SetBannerImage (2, "Interface\\PetBattles\\Weather-Windy", 512*.35, 128*.3, {"bottomleft", "topleft", -25, -4}, {0, 1, 1, 0})
GameCooltip:SetBannerText (1, "Mini Map Menu", {"left", "right", 2, -5}, "white", 10)
--> reset
GameCooltip:AddMenu (1, _detalhes.tabela_historico.resetar, true, nil, nil, Loc ["STRING_MINIMAPMENU_RESET"], nil, true)
GameCooltip:AddIcon ([[Interface\COMMON\VOICECHAT-MUTED]], 1, 1, 14, 14)
GameCooltip:AddLine ("$div")
--> nova instancai
GameCooltip:AddMenu (1, _detalhes.CriarInstancia, true, nil, nil, Loc ["STRING_MINIMAPMENU_NEWWINDOW"], nil, true)
GameCooltip:AddIcon ([[Interface\ICONS\Spell_ChargePositive]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125)
--> reopen window 64: 0.0078125
local reopen = function()
for _, instance in ipairs (_detalhes.tabela_instancias) do
if (not instance:IsAtiva()) then
_detalhes:CriarInstancia (instance.meu_id)
return
end
end
end
GameCooltip:AddMenu (1, reopen, nil, nil, nil, Loc ["STRING_MINIMAPMENU_REOPEN"], nil, true)
GameCooltip:AddIcon ([[Interface\ICONS\Ability_Priest_VoidShift]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125)
GameCooltip:AddMenu (1, _detalhes.ReabrirTodasInstancias, true, nil, nil, Loc ["STRING_MINIMAPMENU_REOPENALL"], nil, true)
GameCooltip:AddIcon ([[Interface\ICONS\Ability_Priest_VoidShift]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125, "#ffb400")
GameCooltip:AddLine ("$div")
--> lock
GameCooltip:AddMenu (1, _detalhes.TravasInstancias, true, nil, nil, Loc ["STRING_MINIMAPMENU_LOCK"], nil, true)
GameCooltip:AddIcon ([[Interface\PetBattles\PetBattle-LockIcon]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125)
GameCooltip:AddMenu (1, _detalhes.DestravarInstancias, true, nil, nil, Loc ["STRING_MINIMAPMENU_UNLOCK"], nil, true)
GameCooltip:AddIcon ([[Interface\PetBattles\PetBattle-LockIcon]], 1, 1, 14, 14, 0.0703125, 0.9453125, 0.0546875, 0.9453125, "gray")
GameCooltip:SetOwner (self, "topright", "bottomleft")
GameCooltip:ShowCooltip()
end
end,
OnTooltipShow = function (tooltip)
tooltip:AddLine ("Details!", 1, 1, 1)
if (_detalhes.minimap.onclick_what_todo == 1) then
tooltip:AddLine (Loc ["STRING_MINIMAP_TOOLTIP1"])
elseif (_detalhes.minimap.onclick_what_todo == 2) then
tooltip:AddLine (Loc ["STRING_MINIMAP_TOOLTIP11"])
end
tooltip:AddLine (Loc ["STRING_MINIMAP_TOOLTIP2"])
end,
})
if (databroker and not LDBIcon:IsRegistered ("Details!")) then
LDBIcon:Register ("Details!", databroker, self.minimap)
end
_detalhes.databroker = databroker
end
--register lib-hotcorners
local reset_func = function (frame, button) _detalhes.tabela_historico:resetar() end
local on_click_on_hotcorner_button = function (frame, button)
if (_detalhes.hotcorner_topleft.onclick_what_todo == 1) then
local lower_instance = _detalhes:GetLowerInstanceNumber()
if (not lower_instance) then
local instance = _detalhes:GetInstance (1)
_detalhes.CriarInstancia (_, _, 1)
_detalhes:OpenOptionsWindow (instance)
else
_detalhes:OpenOptionsWindow (_detalhes:GetInstance (lower_instance))
end
elseif (_detalhes.hotcorner_topleft.onclick_what_todo == 2) then
_detalhes.tabela_historico:resetar()
end
end
local on_click_on_quickclick_button = function (frame, button)
if (_detalhes.hotcorner_topleft.quickclick_what_todo == 1) then
local lower_instance = _detalhes:GetLowerInstanceNumber()
if (not lower_instance) then
local instance = _detalhes:GetInstance (1)
_detalhes.CriarInstancia (_, _, 1)
_detalhes:OpenOptionsWindow (instance)
else
_detalhes:OpenOptionsWindow (_detalhes:GetInstance (lower_instance))
end
elseif (_detalhes.hotcorner_topleft.quickclick_what_todo == 2) then
_detalhes.tabela_historico:resetar()
end
end
local tooltip_hotcorner = function()
GameTooltip:AddLine ("Details!", 1, 1, 1, 1)
if (_detalhes.hotcorner_topleft.onclick_what_todo == 1) then
GameTooltip:AddLine ("|cFF00FF00Left Click:|r open options panel.", 1, 1, 1, 1)
elseif (_detalhes.hotcorner_topleft.onclick_what_todo == 2) then
GameTooltip:AddLine ("|cFF00FF00Left Click:|r clear all segments.", 1, 1, 1, 1)
end
end
_detalhes:RegisterHotCornerButton (
--> absolute name
@@ -616,13 +761,13 @@ function _G._detalhes:Start()
--> icon
[[Interface\AddOns\Details\images\minimap]],
--> tooltip
"|cFFFFFFFFDetails!\n|cFF00FF00Left Click:|r clear all segments.",
tooltip_hotcorner,
--> click function
reset_func,
on_click_on_hotcorner_button,
--> menus
nil,
--> quick click
reset_func)
on_click_on_quickclick_button)
--> register time captures
--_detalhes:LoadUserTimeCaptures()
@@ -646,10 +791,11 @@ function _G._detalhes:Start()
b:SetAlpha (1)
--]]
--function _detalhes:OpenOptionsWindowAtStart()
function _detalhes:OpenOptionsWindowAtStart()
--_detalhes:OpenOptionsWindow (_detalhes.tabela_instancias[1])
--end
--_detalhes:ScheduleTimer ("OpenOptionsWindowAtStart", 2)
--print (_G ["DetailsClearSegmentsButton1"]:GetSize())
end
_detalhes:ScheduleTimer ("OpenOptionsWindowAtStart", 2)
end