- Fixed an issue with overall data not updating correctly at the end of the combat.

- Added a tutorial line on the window when the user access overall data.
This commit is contained in:
Tercio
2016-12-29 18:31:37 -02:00
parent 55a1065849
commit 33f8ad58c2
7 changed files with 64 additions and 11 deletions
+5 -4
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1816,7 +1816,7 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex
_table_sort (bs_table, _detalhes.Sort2)
instancia.top = bs_table [1][2]
end
local total2 = bs_index
if (exportar) then
+12
View File
@@ -73,9 +73,21 @@ function historico:adicionar_overall (tabela)
_detalhes.tabela_overall.data_inicio = _detalhes.tabela_vigente.data_inicio or 0
end
--
_detalhes.tabela_overall:seta_data (_detalhes._detalhes_props.DATA_TYPE_END)
_detalhes:ClockPluginTickOnSegment()
for id, instance in _detalhes:ListInstances() do
if (instance:IsEnabled()) then
if (instance:GetSegment() == -1) then
instance:ForceRefresh()
--instance:AtualizaGumpPrincipal (true)
--print ("isntance", id, "overall updated.")
end
end
end
end
function _detalhes:GetCurrentCombat()
+19 -1
View File
@@ -1533,7 +1533,7 @@
return instancia:MontaTooltip (esta_barra, qual_barra)
end
end
function _detalhes:EndRefresh (instancia, total, tabela_do_combate, showing)
_detalhes:EsconderBarrasNaoUsadas (instancia, showing)
end
@@ -1547,6 +1547,20 @@
_detalhes.gump:Fade (instancia.barras[barra_numero], "in")
end
instancia.v_barras = false
if (instancia.rows_showing == 0 and instancia:GetSegment() == -1) then -- -1 overall data
if (not instancia:IsShowingOverallDataWarning()) then
local tutorial = _detalhes:GetTutorialCVar ("OVERALLDATA_WARNING1") or 0
if (tutorial < 10) then
_detalhes:SetTutorialCVar ("OVERALLDATA_WARNING1", tutorial + 1)
instancia:ShowOverallDataWarning (true)
end
end
else
if (instancia:IsShowingOverallDataWarning()) then
instancia:ShowOverallDataWarning (false)
end
end
end
return showing
@@ -1586,6 +1600,10 @@
end
function _detalhes:ForceRefresh()
self:AtualizaGumpPrincipal (true)
end
function _detalhes:AtualizaGumpPrincipal (instancia, forcar)
if (not instancia or type (instancia) == "boolean") then --> o primeiro parâmetro não foi uma instância ou ALL
+2 -2
View File
@@ -3037,14 +3037,14 @@
{"Low Dps Guy", "MONK", },
{"Helvis Phresley", "DEATHKNIGHT", },
{"Stormwind Guard", "WARRIOR", },
{"A PvP Player", "ROGUE", },
{"A PvP Player", "ROGUE", 260},
{"Bolvar Fordragon", "PALADIN", },
{"Malygos", "MAGE", },
{"Akama", "ROGUE", },
{"Nozdormu", "MAGE", },
{"Lady Blaumeux", "DEATHKNIGHT", },
{"Cairne Bloodhoof", "WARRIOR", },
{"Borivar", "ROGUE", },
{"Borivar", "ROGUE", 260},
{"C'Thun", "WARLOCK", },
{"Drek'Thar", "DEATHKNIGHT", },
{"Durotan", "WARRIOR", },
+3 -3
View File
@@ -1103,7 +1103,7 @@ function SlashCmdList.DETAILS (msg, editbox)
["128289"] = true, --warrior prot
}
if (equip_id == 17) then
if (equip_id == 17) then -- and false
local itemId = select (2, strsplit (":", item))
if (artifact_offhands [itemId]) then
local mainHand = GetInventoryItemLink (unitid, 16)
@@ -1121,10 +1121,10 @@ function SlashCmdList.DETAILS (msg, editbox)
if (ItemUpgradeInfo) then
local ilvl = ItemUpgradeInfo:GetUpgradedItemLevel (item)
item_level = item_level + (ilvl or iLevel)
--print (iName, ilvl, iLevel)
print (item, ilvl, iLevel)
else
item_level = item_level + iLevel
--print (iName, iLevel)
print (iName, iLevel, "-|cFFFF0000lib not found|r-")
end
--> 16 = main hand 17 = off hand
+22
View File
@@ -3519,6 +3519,14 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando)
-- instance mini widgets -------------------------------------------------------------------------------------------------------------------------------------------------
--> overall data warning
instancia.overall_data_warning = backgrounddisplay:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
instancia.overall_data_warning:SetHeight (64)
instancia.overall_data_warning:SetPoint ("center", backgrounddisplay, "center")
instancia.overall_data_warning:SetTextColor (.8, .8, .8, .5)
instancia.overall_data_warning:Hide()
instancia.overall_data_warning:SetText (Loc ["STRING_TUTORIAL_OVERALL1"])
--> freeze icon
instancia.freeze_icon = backgrounddisplay:CreateTexture (nil, "overlay")
instancia.freeze_icon:SetWidth (64)
@@ -3783,6 +3791,20 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando)
end
function _detalhes:IsShowingOverallDataWarning()
return self.overall_data_warning:IsShown()
end
function _detalhes:ShowOverallDataWarning (state)
if (state) then
self.overall_data_warning:Show()
self.overall_data_warning:SetWidth (self:GetSize() - 20)
else
self.overall_data_warning:Hide()
end
end
function _detalhes:SetBarFollowPlayer (follow)
if (follow == nil) then