- more small fixes.

This commit is contained in:
Tercio
2015-04-06 18:24:19 -03:00
parent c5dab8e316
commit 12299f1a0a
10 changed files with 63 additions and 10 deletions
+2 -2
View File
File diff suppressed because one or more lines are too long
+2 -1
View File
@@ -988,6 +988,7 @@
local textPoint = {"left", "right", -11, -5}
local avatarTexCoord = {0, 1, 0, 1}
local backgroundColor = {0, 0, 0, 0.6}
local avatarTextColor = {1, 1, 1, 1}
function _detalhes:AddTooltipBackgroundStatusbar()
GameCooltip:AddStatusBar (100, 1, unpack (_detalhes.tooltip.background))
@@ -1056,7 +1057,7 @@
if (avatar [2] and avatar [4] and avatar [1]) then
GameCooltip:SetBannerImage (1, avatar [2], 80, 40, avatarPoint, avatarTexCoord, nil) --> overlay [2] avatar path
GameCooltip:SetBannerImage (2, avatar [4], 200, 55, backgroundPoint, avatar [5], avatar [6]) --> background
GameCooltip:SetBannerText (1, (not _detalhes.ignore_nicktag and avatar [1]) or objeto.nome, textPoint) --> text [1] nickname
GameCooltip:SetBannerText (1, (not _detalhes.ignore_nicktag and avatar [1]) or objeto.nome, textPoint, avatarTextColor, 14, SharedMedia:Fetch ("font", _detalhes.tooltip.fontface)) --> text [1] nickname
end
else
if (_detalhes.remove_realm_from_name and objeto.displayName:find ("%*")) then
+37 -3
View File
@@ -223,6 +223,9 @@ end
-- for beta todo: info background need a major rewrite
function gump:TrocaBackgroundInfo()
info.bg3_sec_texture:Hide()
info.bg2_sec_texture:Hide()
if (info.atributo == 1) then --> DANO
if (info.sub_atributo == 1 or info.sub_atributo == 2) then --> damage done / dps
@@ -243,6 +246,8 @@ function gump:TrocaBackgroundInfo()
if (info.tipo ~= 2) then --> janela com fundo diferente
info.bg1:SetTexture ([[Interface\AddOns\Details\images\info_window_background]])
info.bg1_sec_texture:SetTexture ([[Interface\AddOns\Details\images\info_window_damagetaken]])
info.bg3_sec_texture:Show()
info.bg2_sec_texture:Show()
info.tipo = 2
end
@@ -254,6 +259,8 @@ function gump:TrocaBackgroundInfo()
if (info.tipo ~= 3) then --> janela com fundo diferente
info.bg1:SetTexture ([[Interface\AddOns\Details\images\info_window_background]])
info.bg1_sec_texture:SetTexture ([[Interface\AddOns\Details\images\info_window_damagetaken]])
info.bg3_sec_texture:Show()
info.bg2_sec_texture:Show()
info.tipo = 3
end
info.targets:SetText (Loc ["STRING_SPELLS"] .. ":")
@@ -262,6 +269,8 @@ function gump:TrocaBackgroundInfo()
if (info.tipo ~= 3) then --> janela com fundo diferente
info.bg1:SetTexture ([[Interface\AddOns\Details\images\info_window_background]])
info.bg1_sec_texture:SetTexture ([[Interface\AddOns\Details\images\info_window_damagetaken]])
info.bg3_sec_texture:Show()
info.bg2_sec_texture:Show()
info.tipo = 3
end
info.targets:SetText (Loc ["STRING_DAMAGE_TAKEN_FROM"])
@@ -290,6 +299,8 @@ function gump:TrocaBackgroundInfo()
if (info.tipo ~= 2) then --> janela com fundo diferente
info.bg1:SetTexture ([[Interface\AddOns\Details\images\info_window_background]])
info.bg1_sec_texture:SetTexture ([[Interface\AddOns\Details\images\info_window_damagetaken]])
info.bg3_sec_texture:Show()
info.bg2_sec_texture:Show()
info.tipo = 2
end
@@ -802,11 +813,27 @@ function gump:CriaJanelaInfo()
_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:SetDrawLayer ("BORDER", 4)
este_gump.bg1_sec_texture:SetPoint ("topleft", este_gump.bg1, "topleft", 348, -86)
este_gump.bg1_sec_texture:SetHeight (262)
este_gump.bg1_sec_texture:SetWidth (264)
este_gump.bg2_sec_texture = este_gump:CreateTexture (nil, "BORDER")
este_gump.bg2_sec_texture:SetDrawLayer ("BORDER", 3)
este_gump.bg2_sec_texture:SetPoint ("topleft", este_gump.bg1_sec_texture, "topleft", 8, 0)
este_gump.bg2_sec_texture:SetPoint ("bottomright", este_gump.bg1_sec_texture, "bottomright", -30, 0)
este_gump.bg2_sec_texture:SetTexture ([[Interface\Glues\CREDITS\Warlords\Shadowmoon_Color_jlo3]])
este_gump.bg2_sec_texture:SetDesaturated (true)
este_gump.bg2_sec_texture:SetAlpha (0.3)
este_gump.bg2_sec_texture:Hide()
este_gump.bg3_sec_texture = este_gump:CreateTexture (nil, "BORDER")
este_gump.bg3_sec_texture:SetDrawLayer ("BORDER", 2)
este_gump.bg3_sec_texture:SetPoint ("topleft", este_gump.bg2_sec_texture, "topleft", 0, 0)
este_gump.bg3_sec_texture:SetPoint ("bottomright", este_gump.bg2_sec_texture, "bottomright", 0, 0)
este_gump.bg3_sec_texture:SetTexture (0, 0, 0, 1)
este_gump.bg3_sec_texture:Hide()
--> botão de fechar
este_gump.fechar = _CreateFrame ("Button", nil, este_gump, "UIPanelCloseButton")
este_gump.fechar:SetWidth (32)
@@ -3240,6 +3267,10 @@ function _detalhes.janela_info:monta_relatorio (botao)
--> is a pet
else
nome = _GetSpellInfo (player.detalhes)
local spelllink = GetSpellLink (player.detalhes)
if (spelllink) then
nome = spelllink
end
end
if (not nome) then
@@ -3280,6 +3311,9 @@ function _detalhes.janela_info:monta_relatorio (botao)
linha = linha..dano_porcento.." "
end
--> remove a cor da school
linha = linha:gsub ("|c%x?%x?%x?%x?%x?%x?%x?%x?", "")
linha = linha:gsub ("|r", "")
report_lines [#report_lines+1] = linha
@@ -3762,7 +3796,7 @@ function gump:CriaNovaBarraInfo2 (instancia, index)
return esta_barra
end
local x_start = 62
local x_start = 61
local y_start = -10
function gump:CriaNovaBarraInfo3 (instancia, index)
@@ -3782,7 +3816,7 @@ function gump:CriaNovaBarraInfo3 (instancia, index)
y = y*-1
esta_barra:SetPoint ("LEFT", janela, "LEFT", x_start, 0)
esta_barra:SetPoint ("RIGHT", janela, "RIGHT", 59, 0)
esta_barra:SetPoint ("RIGHT", janela, "RIGHT", 65, 0)
esta_barra:SetPoint ("TOP", janela, "TOP", 0, y+y_start)
esta_barra:EnableMouse (true)
+1 -1
View File
@@ -5424,7 +5424,7 @@ local build_segment_list = function (self, elapsed)
-- combats added
local combats_added = _detalhes.tabela_overall.segments_added or _detalhes.empty_table
CoolTip:AddLine ("Segments" .. ":", #combats_added, 2, "white", "white")
CoolTip:AddLine (Loc ["STRING_SEGMENTS"] .. ":", #combats_added, 2, "white", "white")
if (#combats_added > 0) then
CoolTip:AddLine ("", "", 2, "white", "white")
Binary file not shown.
Binary file not shown.
@@ -305,6 +305,20 @@ local function CreatePluginFrames (data)
EncounterDetails:SetTutorialCVar ("ENCOUNTER_DETAILS_TUTORIAL2", true)
EncounterDetails:ButtonsTutorial()
end
--select latest emote segment
Details_EncounterDetailsEmotesSegmentDropdown.MyObject:Select (1)
Details_EncounterDetailsEmotesSegmentDropdown.MyObject:Refresh()
FauxScrollFrame_SetOffset (EncounterDetails_EmoteScroll, 0)
EncounterDetails:SetEmoteSegment (1)
EncounterDetails_EmoteScroll:Update()
if (EncounterDetailsFrame.ShowType ~= "emotes") then
--hide emote frames
for _, widget in pairs (EncounterDetails.Frame.EmoteWidgets) do
widget:Hide()
end
end
return true
end
@@ -856,7 +870,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
end
EncounterDetails.update_enemy_spells()
end
EncounterDetails.LastSegmentShown = _combat_object
-------------- set boss name and zone name --------------
@@ -1490,6 +1490,10 @@ do
scrollframe:Update()
end
function EncounterDetails:SetEmoteSegment (segment)
emote_segment = segment
end
local segment_icon = [[Interface\AddOns\Details\images\icons]]
local segment_icon_coord = {0.7373046875, 0.9912109375, 0.6416015625, 0.7978515625}
local segment_icon_color = {1, 1, 1, 0.5}
@@ -648,7 +648,7 @@ local runes_id = {
focus_aug2:SetText (n)
local bigger = math.max (amount1, amount2, amount3, amount4, amount5, amount6)
local bigger = math.max (amount1, amount2, amount3, amount4, amount5, amount6, amount7)
show_panel:SetHeight (100 + (bigger * 10))
end
@@ -216,7 +216,7 @@ local blackrock_foundry = {
},
[8] = {
boss = "Kromog, Legend of the Mountain",
boss = "Kromog",
portrait = [[Interface\ENCOUNTERJOURNAL\UI-EJ-BOSS-Kromog]],
--> spell list