Skip to content

Commit

Permalink
- Added option 'Ignore Mass Toggle', when enabled the window won't be…
Browse files Browse the repository at this point in the history
… affected when hiding, showing or toggling all windows.

- Added window number for slash commands 'hide', 'show' and 'toggle'. Usage: '/details hide 1' to hide window 1.
- Removed keybinds for Open and Close, added toggle instead.
- Added slash command 'toggle'.
- Added display icons for all skins which still didn't have they.
- Improved 'Align with right chat' tool, now it also supports Forced Square skin.
- Improvements on Bookmark panel.
- Improvements on spec icons with transparency.
- Created custom spell for Living Bomb explosion.
- Fixed statusbar textures and mini displays.
- Fixed an issue with title bar buttons when toggling the titlebar anchor from bottom to top position.
- Fixed an issue with title bar text when toggling the statusbar position from bottom to top.
- Fixed yet another bug with avoidance tab on player detail window.
- Fixed the window ungroup button (above the resize one).
  • Loading branch information
Tercio authored and Tercio committed Feb 2, 2015
1 parent a5ede3a commit ae3d951
Show file tree
Hide file tree
Showing 16 changed files with 220 additions and 88 deletions.
23 changes: 13 additions & 10 deletions boot.lua

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion classes/classe_damage.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@ end

local actor_class_color_r, actor_class_color_g, actor_class_color_b

--self = esta classe de dano
-- ~atualizar ~barra
function atributo_damage:AtualizaBarra (instancia, barras_container, qual_barra, lugar, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations, bars_show_data, bars_brackets, bars_separator)
-- instância, container das barras, qual barra, colocação, total?, sub atributo, forçar refresh, key

Expand Down
31 changes: 21 additions & 10 deletions classes/classe_instancia.lua
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ end

function _detalhes:ShutDownAllInstances()
for index, instance in _ipairs (_detalhes.tabela_instancias) do
if (instance:IsEnabled()) then
if (instance:IsEnabled() and instance.baseframe and not instance.ignore_mass_showhide) then
instance:ShutDown()
end
end
Expand Down Expand Up @@ -410,7 +410,17 @@ end
end

function _detalhes:ToggleWindows()
local instance = _detalhes:GetInstance (1)

local instance

for i = 1, #_detalhes.tabela_instancias do
local this_instance = _detalhes:GetInstance (i)
if (this_instance and not this_instance.ignore_mass_showhide) then
instance = this_instance
break
end
end

if (instance) then
if (instance:IsEnabled()) then
_detalhes:ShutDownAllInstances()
Expand All @@ -430,7 +440,9 @@ end
function _detalhes:ReabrirTodasInstancias (temp)
for index = math.min (#_detalhes.tabela_instancias, _detalhes.instances_amount), 1, -1 do
local instancia = _detalhes:GetInstance (index)
instancia:AtivarInstancia (temp)
if (instancia and not instancia.ignore_mass_showhide) then
instancia:AtivarInstancia (temp)
end
end
end

Expand Down Expand Up @@ -477,8 +489,6 @@ end
end
end

--> oposto do desativar, ela apenas volta a mostrar a janela

--> alias
function _detalhes:EnableInstance (temp)
return self:AtivarInstancia (temp)
Expand Down Expand Up @@ -740,13 +750,14 @@ end

function _detalhes:BaseFrameSnap()

for meu_id, instancia in _ipairs (_detalhes.tabela_instancias) do
local group = self:GetInstanceGroup()

for meu_id, instancia in _ipairs (group) do
if (instancia:IsAtiva()) then
instancia.baseframe:ClearAllPoints()
end
end

local group = self:GetInstanceGroup()
local scale = self.window_scale
for _, instance in _ipairs (group) do
instance:SetWindowScale (scale)
Expand Down Expand Up @@ -3115,7 +3126,7 @@ function _detalhes:envia_relatorio (linhas, custom)
local alvo = _detalhes.report_to_who

if (not alvo or alvo == "") then
print (Loc ["STRING_REPORT_INVALIDTARGET"])
_detalhes:Msg (Loc ["STRING_REPORT_INVALIDTARGET"])
return
end

Expand All @@ -3132,11 +3143,11 @@ function _detalhes:envia_relatorio (linhas, custom)
if (_UnitIsPlayer ("target")) then
alvo = _UnitName ("target")
else
print (Loc ["STRING_REPORT_INVALIDTARGET"])
_detalhes:Msg (Loc ["STRING_REPORT_INVALIDTARGET"])
return
end
else
print (Loc ["STRING_REPORT_INVALIDTARGET"])
_detalhes:Msg (Loc ["STRING_REPORT_INVALIDTARGET"])
return
end

Expand Down
3 changes: 3 additions & 0 deletions classes/classe_instancia_include.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ _detalhes.instance_skin_ignored_values = {
["strata"] = true,
["grab_on_top"] = true,
["libwindow"] = true,
["ignore_mass_showhide"] = true,
}

function _detalhes:ResetInstanceConfigKeepingValues (maintainsnap)
Expand Down Expand Up @@ -89,6 +90,8 @@ end

_detalhes.instance_defaults = {

--> window settings
ignore_mass_showhide = false,
--skin
skin = _detalhes.default_skin_to_use,
--scale
Expand Down
10 changes: 5 additions & 5 deletions core/parser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -627,11 +627,11 @@
function parser:summon (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellName)

--[[statistics]]-- _detalhes.statistics.pets_summons = _detalhes.statistics.pets_summons + 1
--if (who_name:find ("Kastfall")) then
-- print ("SUMMON", who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags)
--end


if (not _detalhes.capture_real ["damage"] and not _detalhes.capture_real ["heal"]) then
return
end
if (not who_name) then
who_name = "[*] " .. spellName
end
Expand Down
75 changes: 55 additions & 20 deletions functions/skins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,13 @@ local _
site = "unknown",
desc = "Simple skin with soft gray color and half transparent frames.", --\n

micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10},
--micro frames
micro_frames = {
color = {1, 1, 1, 1},
font = "Accidental Presidency",
size = 10,
textymod = 1,
},

can_change_alpha_head = true,
icon_anchor_main = {-1, -5},
Expand Down Expand Up @@ -358,11 +364,12 @@ local _
["desaturated_menu"] = false,
["micro_displays_side"] = 2,
["statusbar_info"] = {
["alpha"] = 0.622480094432831,
["alpha"] = 0.3777777777777, -- [4]
["overlay"] = {
0.333333333333333, -- [1]
0.298039215686275, -- [2]
0.337254901960784, -- [3]
0.333333333333333, -- [1]
0.333333333333333, -- [2]
0.333333333333333, -- [3]

},
},
["hide_icon"] = true,
Expand Down Expand Up @@ -494,7 +501,13 @@ local _
site = "unknown",
desc = "Same as the first Minimalistic, but this one is more darker and less transparent.",

micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10},
--micro frames
micro_frames = {
color = {1, 1, 1, 0.7},
font = "Friz Quadrata TT",
size = 9,
textymod = 0,
},

can_change_alpha_head = true,
icon_anchor_main = {-1, -5},
Expand Down Expand Up @@ -632,11 +645,11 @@ local _
-2, -- [2]
},
["statusbar_info"] = {
["alpha"] = 1,
["alpha"] = 0.77,
["overlay"] = {
1, -- [1]
1, -- [2]
1, -- [3]
0.28627, -- [1]
0.28627, -- [2]
0.28627, -- [3]
},
},
["hide_icon"] = true,
Expand Down Expand Up @@ -707,7 +720,14 @@ local _
site = "unknown",
desc = "Light blue, this skin fits on almost all interfaces.\n\nFor ElvUI interfaces, change the window color to black to get an compatible visual.",

micro_frames = {color = {1, 1, 1, 1}, font = "Friz Quadrata TT", size = 10, left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"},
--micro frames
micro_frames = {
left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE",
color = {1, 1, 1, 0.7},
font = "Accidental Presidency",
size = 10,
textymod = 0,
},

can_change_alpha_head = true,

Expand Down Expand Up @@ -763,7 +783,7 @@ local _
["text_face"] = "Accidental Presidency",
["anchor"] = {
-17, -- [1]
2, -- [2]
3, -- [2]
},
["text_size"] = 12,
["enable_custom_text"] = false,
Expand Down Expand Up @@ -1002,7 +1022,12 @@ local _
icon_plugins_size = {19, 18},

--micro frames
micro_frames = {color = {.7, .7, .7, 1}, font = "Arial Narrow", size = 11, left = "DETAILS_STATUSBAR_PLUGIN_PATTRIBUTE"},
micro_frames = {
color = {.7, .7, .7, 0.7},
font = "FORCED SQUARE",
size = 10,
textymod = 1,
},

-- the four anchors (for when the toolbar is on the top side)
icon_point_anchor = {-37, 0},
Expand Down Expand Up @@ -1039,6 +1064,10 @@ local _
2,
["side"] = 2,
},
["menu_anchor_down"] = {
14,
-2,
},
["bg_r"] = 0,
["following"] = {
["enabled"] = false,
Expand Down Expand Up @@ -1197,10 +1226,6 @@ local _
["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight",
["percent_type"] = 1,
},
["menu_anchor_down"] = {
-20,
-3,
},
["toolbar_side"] = 1,
["bg_g"] = 0,
["bars_grow_direction"] = 1,
Expand Down Expand Up @@ -1378,9 +1403,14 @@ local _
icon_anchor_main = {-4, -5},
icon_anchor_plugins = {-7, -13},
icon_plugins_size = {19, 18},

--micro frames
micro_frames = {color = {0.525490, 0.525490, 0.525490, 1}, font = "Arial Narrow", size = 11},
micro_frames = {
color = {1, 1, 1, 0.7},
font = "FORCED SQUARE",
size = 10,
textymod = 1,
},

-- the four anchors (for when the toolbar is on the top side)
icon_point_anchor = {-35, -0.5},
Expand Down Expand Up @@ -1621,7 +1651,12 @@ local _
icon_plugins_size = {19, 18},

--micro frames
micro_frames = {color = {0.525490, 0.525490, 0.525490, 1}, font = "Arial Narrow", size = 11},
micro_frames = {
color = {0.525490, 0.525490, 0.525490, 1},
font = "FORCED SQUARE",
size = 11,
textymod = 1,
},

-- the four anchors (for when the toolbar is on the top side)
icon_point_anchor = {-35, -0.5},
Expand Down
66 changes: 47 additions & 19 deletions functions/slash.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,47 @@ function SlashCmdList.DETAILS (msg, editbox)
if (command == Loc ["STRING_SLASH_NEW"] or command == "new") then
_detalhes:CriarInstancia (nil, true)

elseif (command == Loc ["STRING_SLASH_TOGGLE"] or command == "toggle") then

local instance = rest:match ("^(%S*)%s*(.-)$")
instance = tonumber (instance)
if (instance) then
_detalhes:ToggleWindow (instance)
else
_detalhes:ToggleWindows()
end

elseif (command == Loc ["STRING_SLASH_HIDE"] or command == Loc ["STRING_SLASH_HIDE_ALIAS1"] or command == "hide") then
_detalhes:ShutDownAllInstances()

local instance = rest:match ("^(%S*)%s*(.-)$")
instance = tonumber (instance)
if (instance) then
local this_instance = _detalhes:GetInstance (instance)
if (not this_instance) then
return _detalhes:Msg (Loc ["STRING_WINDOW_NOTFOUND"])
end
if (this_instance:IsEnabled() and this_instance.baseframe) then
this_instance:ShutDown()
end
else
_detalhes:ShutDownAllInstances()
end

elseif (command == Loc ["STRING_SLASH_SHOW"] or command == Loc ["STRING_SLASH_SHOW_ALIAS1"] or command == "show") then
_detalhes:ReabrirTodasInstancias()

local instance = rest:match ("^(%S*)%s*(.-)$")
instance = tonumber (instance)
if (instance) then
local this_instance = _detalhes:GetInstance (instance)
if (not this_instance) then
return _detalhes:Msg (Loc ["STRING_WINDOW_NOTFOUND"])
end
if (not this_instance:IsEnabled() and this_instance.baseframe) then
this_instance:EnableInstance()
end
else
_detalhes:ReabrirTodasInstancias()
end

elseif (command == Loc ["STRING_SLASH_WIPECONFIG"] or command == "reinstall") then
_detalhes:WipeConfig()
Expand Down Expand Up @@ -73,12 +109,7 @@ function SlashCmdList.DETAILS (msg, editbox)
end

end

elseif (command == Loc ["STRING_SLASH_TOGGLE"] or command == "toggle") then

_detalhes:ToggleWindows()


elseif (command == Loc ["STRING_SLASH_WORLDBOSS"] or command == "worldboss") then

local questIds = {{"Tarlna the Ageless", 81535}, {"Drov the Ruiner ", 87437}, {"Rukhmar", 87493}}
Expand Down Expand Up @@ -869,18 +900,15 @@ function SlashCmdList.DETAILS (msg, editbox)

print (" ")
print (Loc ["STRING_DETAILS1"] .. "(" .. _detalhes.userversion .. ") " .. Loc ["STRING_COMMAND_LIST"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_NEW"] .. "|r: " .. Loc ["STRING_SLASH_NEW_DESC"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_SHOW"] .. "|r: " .. Loc ["STRING_SLASH_SHOW_DESC"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_HIDE"] .. "|r: " .. Loc ["STRING_SLASH_HIDE_DESC"])

print ("|cffffaeae/details " .. Loc ["STRING_SLASH_TOGGLE"] .. "|r: " .. Loc ["STRING_SLASH_TOGGLE_DESC"])

print ("|cffffaeae/details " .. Loc ["STRING_SLASH_ENABLE"] .. "|r: " .. Loc ["STRING_SLASH_ENABLE_DESC"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_DISABLE"] .. "|r: " .. Loc ["STRING_SLASH_DISABLE_DESC"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_RESET"] .. "|r: " .. Loc ["STRING_SLASH_RESET_DESC"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_OPTIONS"] .. "|r|cfffcffb0 <instance number>|r: " .. Loc ["STRING_SLASH_OPTIONS_DESC"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_CHANGES"] .. "|r: " .. Loc ["STRING_SLASH_CHANGES_DESC"])
print ("|cffffaeae/details " .. Loc ["STRING_SLASH_WIPECONFIG"] .. "|r: " .. Loc ["STRING_SLASH_WIPECONFIG_DESC"])

print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_NEW"] .. "|r: " .. Loc ["STRING_SLASH_NEW_DESC"])
print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_SHOW"] .. " " .. Loc ["STRING_SLASH_HIDE"] .. " " .. Loc ["STRING_SLASH_TOGGLE"] .. "|r|cfffcffb0 <" .. Loc ["STRING_WINDOW_NUMBER"] .. ">|r: " .. Loc ["STRING_SLASH_SHOWHIDETOGGLE_DESC"])
print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_ENABLE"] .. " " .. Loc ["STRING_SLASH_DISABLE"] .. "|r: " .. Loc ["STRING_SLASH_CAPTURE_DESC"])
print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_RESET"] .. "|r: " .. Loc ["STRING_SLASH_RESET_DESC"])
print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_OPTIONS"] .. "|r|cfffcffb0 <" .. Loc ["STRING_WINDOW_NUMBER"] .. ">|r: " .. Loc ["STRING_SLASH_OPTIONS_DESC"])
print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_CHANGES"] .. "|r: " .. Loc ["STRING_SLASH_CHANGES_DESC"])
print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_WIPECONFIG"] .. "|r: " .. Loc ["STRING_SLASH_WIPECONFIG_DESC"])

--print ("|cffffaeae/details " .. Loc ["STRING_SLASH_WORLDBOSS"] .. "|r: " .. Loc ["STRING_SLASH_WORLDBOSS_DESC"])
print (" ")

Expand Down
12 changes: 6 additions & 6 deletions gumps/janela_info.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1266,14 +1266,14 @@ function gump:CriaJanelaInfo()
n = n:gsub (("-.*"), "")
end
tab.tankname:SetText ("Avoidance of\n" .. n) --> localize-me

if (not playerdamage.avoidance) then
playerdamage.avoidance = _detalhes:CreateActorAvoidanceTable()
end


--> damage taken
local playerdamage = combat (1, player.nome)


if (not playerdamage.avoidance) then
playerdamage.avoidance = _detalhes:CreateActorAvoidanceTable()
end

local damagetaken = playerdamage.damage_taken
local last_damage_received = 0
if (last_actor) then
Expand Down
Loading

0 comments on commit ae3d951

Please sign in to comment.