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

- Fixed a bug when bars isn't using class colors on Frags, Auras & Void Zones, Resources and Deaths.

Browse Source 
- Fixed bar animations when 'Sort Direction' is set to bottom.
- Fixed combat on garrison training dummies which was being marked as Trash Segment.
- Fixed the spam 'you are not in a guild' when checking for new versions.
- Fixed translations for Auto Hide Settings bracket under options panel.
- Fixed Auto Hide -> Mouse Interaction tool where wans't able to work okey during combat.
This commit is contained in:
Tercio
2015-01-03 12:19:48 -02:00
parent c1a70256f8
commit 8b0c893bde
10 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+11 -3
View File
File diff suppressed because one or more lines are too long
classes/classe_damage.lua
+10 -13
View File
@@ -532,18 +532,11 @@
gump:Fade (esta_barra, "out")
end
--> ele nao come o texto quando a instância esta muito pequena
esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [tabela [3]]))
if (tabela [3] == "UNKNOW" or tabela [3] == "UNGROUPPLAYER" or tabela [3] == "ENEMY") then
--esta_barra.icone_classe:SetTexture ("Interface\\LFGFRAME\\LFGROLE_BW")
--esta_barra.icone_classe:SetTexCoord (.25, .5, 0, 1)
--esta_barra.icone_classe:SetVertexColor (1, 1, 1)
if (instancia.row_info.texture_class_colors) then
esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [tabela [3]]))
end
--esta_barra.icone_classe:SetTexture ([[Interface\MINIMAP\Minimap_skull_normal]])
--esta_barra.icone_classe:SetTexCoord (0, 1, 0, 1)
--esta_barra.icone_classe:SetVertexColor (1, 1, 1)
if (tabela [3] == "UNKNOW" or tabela [3] == "UNGROUPPLAYER" or tabela [3] == "ENEMY") then
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_plus]])
esta_barra.icone_classe:SetTexCoord (0.50390625, 0.62890625, 0, 0.125)
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
@@ -751,7 +744,9 @@
school_color = _detalhes.school_colors ["unknown"]
end
esta_barra.textura:SetVertexColor (_unpack (school_color))
if (instancia.row_info.texture_class_colors) then
esta_barra.textura:SetVertexColor (_unpack (school_color))
end
esta_barra.icone_classe:SetTexture (icon)
esta_barra.icone_classe:SetTexCoord (0, 1, 0, 1)
esta_barra.icone_classe:SetVertexColor (1, 1, 1)
@@ -1284,7 +1279,7 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex
conteudo[myPos]:AtualizaBarra (instancia, barras_container, qual_barra, myPos, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations) --> instância, index, total, valor da 1º barra
qual_barra = qual_barra+1
else
-- /run print (_detalhes:GetInstance(1).barraS[2]) -- vai do 5 ao 1 -- qual barra começa no 1 -- i = 5 até 1 -- player 5 atualiza na barra 1 / player 1 atualiza na barra 5
for i = instancia.barraS[2], instancia.barraS[1], -1 do --> vai atualizar só o range que esta sendo mostrado
conteudo[i]:AtualizaBarra (instancia, barras_container, qual_barra, i, total, sub_atributo, forcar, keyName, combat_time, percentage_type, use_animations) --> instância, index, total, valor da 1º barra
qual_barra = qual_barra+1
@@ -1497,6 +1492,8 @@ end
--> primeiro colocado
if (esta_barra.colocacao == 1) then
--aqui
esta_barra.animacao_ignorar = true
if (not tabela_anterior or tabela_anterior ~= esta_barra.minha_tabela or forcar) then
esta_barra:SetValue (100)
classes/classe_energy.lua
+3 -1
View File
@@ -224,7 +224,9 @@ function atributo_energy:AtualizarResources (qual_barra, colocacao, instancia)
end
actor_class_color_r, actor_class_color_g, actor_class_color_b = self:GetBarColor()
esta_barra.textura:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b)
if (instancia.row_info.texture_class_colors) then
esta_barra.textura:SetVertexColor (actor_class_color_r, actor_class_color_g, actor_class_color_b)
end
if (self.classe == "UNKNOW") then
esta_barra.icone_classe:SetTexture ([[Interface\AddOns\Details\images\classes_plus]])
classes/classe_others.lua
+8 -1
View File
@@ -472,7 +472,14 @@ function atributo_misc:DeadAtualizarBarra (morte, qual_barra, colocacao, instanc
if (esta_barra.hidden or esta_barra.fading_in or esta_barra.faded) then
gump:Fade (esta_barra, "out")
end
esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [morte[4]]))
if (instancia.row_info.texture_class_colors) then
esta_barra.textura:SetVertexColor (_unpack (_detalhes.class_colors [morte[4]]))
end
if (instancia.row_info.texture_background_class_color) then
esta_barra.background:SetVertexColor (_unpack (_detalhes.class_colors [morte[4]]))
end
esta_barra.icone_classe:SetTexture (instancia.row_info.icon_file)
esta_barra.icone_classe:SetTexCoord (_unpack (CLASS_ICON_TCOORDS [morte[4]]))
core/control.lua
+2 -1
View File
@@ -428,7 +428,8 @@
if (not _detalhes.tabela_vigente.is_boss) then
if (InstanceType == "party" or InstanceType == "raid") then
local in_instance = IsInInstance() --> garrison returns party as instance type.
if ((InstanceType == "party" or InstanceType == "raid") and in_instance) then
_detalhes.tabela_vigente.is_trash = true
end
core/network.lua
+1
View File
@@ -409,6 +409,7 @@
end
function _detalhes:SendGuildData (type, ...)
if not IsInGuild() then return end --> fix from Tim@WoWInterface
_detalhes:SendCommMessage (CONST_DETAILS_PREFIX, _detalhes:Serialize (type, _UnitName ("player"), _GetRealmName(), _detalhes.realversion, ...), "GUILD")
end
core/parser.lua
+1
View File
@@ -2422,6 +2422,7 @@
--SPELL_PERIODIC_DRAIN --> need research
--SPELL_PERIODIC_LEECH --> need research
--SPELL_DISPEL_FAILED --> need research
--SPELL_BUILDING_HEAL --> need research
function _detalhes:CaptureEnable (capture_type)
core/windows.lua
+68 -29
View File
@@ -61,42 +61,81 @@
self.proximo_update = 0
end
-- /run print( _detalhes:GetInstance(1).rowframe:GetParent():GetName())
-- /run print (DetailsBarra_1_1:GetParent():GetName())
function _detalhes:fazer_animacoes()
--aqui
if (self.bars_sort_direction == 2) then
--[
for i = 2, self.rows_fit_in_window do
--local row_anterior = self.barras [i-1]
local row = self.barras [i]
local row_proxima = self.barras [i+1]
if (row_proxima and not row.animacao_ignorar) then
local v = row.statusbar:GetValue()
local v_proxima = row_proxima.statusbar:GetValue()
for i = self.rows_fit_in_window - 1, 1, -1 do
local row = self.barras [i]
local row_proxima = self.barras [i-1]
if (v_proxima > v) then
if (row.animacao_fim >= v_proxima) then
row:SetValue (v_proxima)
else
row:SetValue (row.animacao_fim)
row_proxima.statusbar:SetValue (row.animacao_fim)
if (row_proxima and not row.animacao_ignorar) then
local v = row.statusbar:GetValue()
local v_proxima = row_proxima.statusbar:GetValue()
if (v_proxima > v) then
if (row.animacao_fim >= v_proxima) then
row:SetValue (v_proxima)
else
row:SetValue (row.animacao_fim)
row_proxima.statusbar:SetValue (row.animacao_fim)
end
end
end
end
end
--]]
for i = 2, self.rows_fit_in_window do
local row = self.barras [i]
if (row.animacao_ignorar) then
row.animacao_ignorar = nil
if (row.tem_animacao) then
row.tem_animacao = false
row:SetScript ("OnUpdate", nil)
for i = 1, self.rows_fit_in_window -1 do
local row = self.barras [i]
if (row.animacao_ignorar) then
row.animacao_ignorar = nil
if (row.tem_animacao) then
row.tem_animacao = false
row:SetScript ("OnUpdate", nil)
end
else
if (row.animacao_fim ~= row.animacao_fim2) then
_detalhes:AnimarBarra (row, row.animacao_fim)
row.animacao_fim2 = row.animacao_fim
end
end
else
if (row.animacao_fim ~= row.animacao_fim2) then
_detalhes:AnimarBarra (row, row.animacao_fim)
row.animacao_fim2 = row.animacao_fim
end
else
for i = 2, self.rows_fit_in_window do
local row = self.barras [i]
local row_proxima = self.barras [i+1]
if (row_proxima and not row.animacao_ignorar) then
local v = row.statusbar:GetValue()
local v_proxima = row_proxima.statusbar:GetValue()
if (v_proxima > v) then
if (row.animacao_fim >= v_proxima) then
row:SetValue (v_proxima)
else
row:SetValue (row.animacao_fim)
row_proxima.statusbar:SetValue (row.animacao_fim)
end
end
end
end
for i = 2, self.rows_fit_in_window do
local row = self.barras [i]
if (row.animacao_ignorar) then
row.animacao_ignorar = nil
if (row.tem_animacao) then
row.tem_animacao = false
row:SetScript ("OnUpdate", nil)
end
else
if (row.animacao_fim ~= row.animacao_fim2) then
_detalhes:AnimarBarra (row, row.animacao_fim)
row.animacao_fim2 = row.animacao_fim
end
end
end
end
gumps/janela_options.lua
+8 -10
View File
@@ -2297,10 +2297,10 @@ function window:CreateFrame17()
_detalhes:SendOptionsModifiedEvent (DetailsOptionsWindow.instance)
end
local typeCombatAlpha = {
{value = 1, label = "No Changes", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_03", texcoord = {1, 0, 0, 1}},
{value = 2, label = "While In Combat", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 3, label = "While Out of Combat", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 4, label = "While Out of a Group", onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}}
{value = 1, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_1"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_03", texcoord = {1, 0, 0, 1}, color = "gray"},
{value = 2, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_2"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 3, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_3"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 4, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_4"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}}
}
local buildTypeCombatAlpha = function()
return typeCombatAlpha
@@ -2411,12 +2411,12 @@ function window:CreateFrame17()
{"hideInCombatAnchor", 1, true},
{"combatAlphaLabel", 2},
{"hideOnCombatAlphaLabel", 3},
{"menuAlphaAnchorLabel", 4, true},
{"alphaSwitchLabel", 5},
{"menuOnEnterLabel", 6},
{"menuOnLeaveLabel", 7},
{"alphaIconsTooLabel", 8},
{"alphaIconsTooLabel", 6},
{"menuOnEnterLabel", 7},
{"menuOnLeaveLabel", 8},
}
window:arrange_menu (frame17, left_side, x, -90)
@@ -6340,8 +6340,6 @@ function window:CreateFrame7()
--auto hide menus
--text anchor on options menu
--g:NewLabel (frame7, _, "$parentAutoHideLabelAnchor", "autoHideLabel", Loc ["STRING_OPTIONS_MENU_AUTOHIDE_ANCHOR"], "GameFontNormal")
--left
g:NewLabel (frame7, _, "$parentAutoHideLeftMenuLabel", "autoHideLeftMenuLabel", Loc ["STRING_OPTIONS_MENU_AUTOHIDE_LEFT"], "GameFontHighlightLeft")
gumps/janela_principal.lua
+2 -10
View File
@@ -922,7 +922,6 @@ local function move_janela (baseframe, iniciando, instancia)
for _, esta_instancia in _ipairs (_detalhes.tabela_instancias) do
if (not esta_instancia:IsAtiva() and esta_instancia.iniciada) then
esta_instancia:ResetaGump()
--aqui
gump:Fade (esta_instancia.baseframe, "in", 0.2)
gump:Fade (esta_instancia.baseframe.cabecalho.ball, "in", 0.2)
@@ -3972,12 +3971,10 @@ function _detalhes:SetWindowAlphaForInteract (alpha)
else
--> saiu
if (self.combat_changes_alpha) then --> combat alpha
--self.baseframe:SetAlpha (self.combat_changes_alpha)
self:InstanceAlpha (self.combat_changes_alpha)
self:SetIconAlpha (self.combat_changes_alpha, nil, true)
self.rowframe:SetAlpha (self.combat_changes_alpha) --alpha do combate é absoluta
else
--self.baseframe:SetAlpha (alpha)
self:InstanceAlpha (alpha)
self:SetIconAlpha (alpha, nil, true)
@@ -5392,13 +5389,9 @@ function _detalhes:ChangeSkin (skin_name)
_detalhes:OpenOptionsWindow (self)
end
--> check if is interacting
--> auto interact
if (self.menu_alpha.enabled) then
if (_detalhes.in_combat) then
self:SetWindowAlphaForCombat (true)
else
self:SetWindowAlphaForCombat()
end
self:SetMenuAlpha (nil, nil, nil, nil, self.is_interacting)
end
--> set the scale
@@ -5780,7 +5773,6 @@ function _detalhes:SetMenuAlpha (enabled, onenter, onleave, ignorebars, interact
self.menu_alpha.ignorebars = ignorebars
if (not enabled) then
--> aqui esta mandando setar a alpha do baseframe
self.baseframe:SetAlpha (1)
self.rowframe:SetAlpha (1)
self:InstanceAlpha (self.color[4])