updates

classes/classe_damage.lua

@@ -1000,9 +1000,22 @@ function atributo_damage:AtualizaBarra (instancia, barras_container, qual_barra,
 	local porcentagem = self [keyName] / total * 100
 	local esta_porcentagem
 
-	if ((_detalhes.time_type == 2 and self.grupo) or not _detalhes:CaptureGet ("damage") or not self.shadow) then
-		dps = damage_total / combat_time
-		self.last_dps = dps
+	--tempo da shadow não é mais calculado pela timemachine
+	if ((_detalhes.time_type == 2 and self.grupo) or not _detalhes:CaptureGet ("damage") or not self.shadow) then --not self.shadow is overall but...
+		if (not self.shadow and combat_time == 0) then
+			local p = _detalhes.tabela_vigente (1, self.nome)
+			if (p) then
+				local t = p:Tempo()
+				dps = damage_total / t
+				self.last_dps = dps
+			else
+				dps = damage_total / combat_time
+				self.last_dps = dps
+			end
+		else
+			dps = damage_total / combat_time
+			self.last_dps = dps
+		end
 	else
 		if (not self.on_hold) then
 			dps = damage_total/self:Tempo() --calcula o dps deste objeto

classes/classe_instancia.lua

@@ -1318,25 +1318,34 @@ function _detalhes:TrocaTabela (instancia, segmento, atributo, sub_atributo, ini
 end
 
 function _detalhes:MontaRaidOption (instancia)
-	for index, _name_and_icon in _ipairs (_detalhes.RaidTables.Menu) do 
-		GameCooltip:AddMenu (1, _detalhes.RaidTables.switch, index, nil, nil, _name_and_icon [1], _name_and_icon [2], true)
+	for index, ptable in _ipairs (_detalhes.RaidTables.Menu) do
+		if (ptable [3].__enabled) then
+			GameCooltip:AddMenu (1, _detalhes.RaidTables.switch, index, nil, nil, ptable [1], ptable [2], true)
+		end
 	end
-	if (_detalhes.RaidTables.Mode) then
+	
+	if (_detalhes.RaidTables.Mode and _detalhes.RaidTables.Mode == index) then
 		GameCooltip:SetLastSelected (1, _detalhes.RaidTables.Mode)
 	end
-	GameCooltip:SetColor (1, "black")
+	
+	GameCooltip:SetWallpaper (1, [[Interface\SPELLBOOK\Spellbook-Page-1]], {.6, 0.1, 0, 0.64453125}, {1, 1, 1, 0.1}, true)
 end
 
 function _detalhes:MontaSoloOption (instancia)
-	for index, _name_and_icon in _ipairs (_detalhes.SoloTables.Menu) do 
-		GameCooltip:AddMenu (1, _detalhes.SoloTables.switch, index, nil, nil, _name_and_icon [1], _name_and_icon [2], true)
+	for index, ptable in _ipairs (_detalhes.SoloTables.Menu) do 
+		if (ptable [3].__enabled) then
+			GameCooltip:AddMenu (1, _detalhes.SoloTables.switch, index, nil, nil, ptable [1], ptable [2], true)
+		end
 	end
+	
 	if (_detalhes.SoloTables.Mode) then
 		GameCooltip:SetLastSelected (1, _detalhes.SoloTables.Mode)
 	end
-	GameCooltip:SetColor (1, "black")
+	
+	GameCooltip:SetWallpaper (1, [[Interface\SPELLBOOK\Spellbook-Page-1]], {.6, 0.1, 0, 0.64453125}, {1, 1, 1, 0.1}, true)
 end
 
+-- ~menu
 function _detalhes:MontaAtributosOption (instancia, func)
 
 	func = func or instancia.TrocaTabela
@@ -1370,6 +1379,17 @@ function _detalhes:MontaAtributosOption (instancia, func)
 		CoolTip:AddMenu (1, func, nil, i, nil, atributos.lista[i], nil, true)
 		CoolTip:AddIcon ("Interface\\AddOns\\Details\\images\\atributos_icones", 1, 1, 20, 20, p*(i-1), p*(i), 0, 1)
 		
+		if (i == 1) then
+			CoolTip:SetWallpaper (2, [[Interface\TALENTFRAME\WarlockDestruction-TopLeft]], {1, 0.22, 0, 0.55}, {1, 1, 1, .1})
+		elseif (i == 2) then
+			--CoolTip:SetWallpaper (2, [[Interface\TALENTFRAME\PriestHoly-TopLeft]], {0, .8, 0, 1}, {1, 1, 1, .1})
+			CoolTip:SetWallpaper (2, [[Interface\TALENTFRAME\bg-priest-holy]], {1, .6, 0, .2}, {1, 1, 1, .2})
+		elseif (i == 3) then
+			CoolTip:SetWallpaper (2, [[Interface\TALENTFRAME\ShamanEnhancement-TopLeft]], {0, 1, .2, .6}, {1, 1, 1, .1})
+		elseif (i == 4) then
+			CoolTip:SetWallpaper (2, [[Interface\TALENTFRAME\WarlockCurses-TopLeft]], {.2, 1, 0, 1}, {1, 1, 1, .1})
+		end
+		
 		local options = sub_atributos [i].lista
 		
 		for o = 1, atributos [i] do
@@ -1403,9 +1423,12 @@ function _detalhes:MontaAtributosOption (instancia, func)
 	else
 		CoolTip:SetLastSelected (2, 5, instancia.sub_atributo_last [5]+1)
 	end
-	
+
 	CoolTip:SetLastSelected (1, atributo_ativo)
 	
+	CoolTip:SetWallpaper (1, [[Interface\SPELLBOOK\Spellbook-Page-1]], {.6, 0.1, 0, 0.64453125}, {1, 1, 1, 0.1}, true)
+	--CoolTip:SetWallpaper (1, [[Interface\ACHIEVEMENTFRAME\UI-Achievement-Parchment-Horizontal-Desaturated]], nil, {1, 1, 1, 0.3})
+	
 	return menu_principal, sub_menus
 end
 

classes/classe_instancia_include.lua

@@ -103,6 +103,9 @@ _detalhes.instance_defaults = {
 		},
 	--instance window color
 		color = {1, 1, 1, 1},
+	--hide in combat
+		hide_in_combat = false,
+		hide_in_combat_alpha = 0,
 	--wallpaper
 		wallpaper = {
 			enabled = false,

classes/classe_others.lua

@@ -464,8 +464,10 @@ function atributo_misc:RefreshWindow (instancia, tabela_do_combate, forcar, expo
 
 		if (instancia.bars_sort_direction == 1) then
 			for i = instancia.barraS[1], instancia.barraS[2], 1 do --> vai atualizar só o range que esta sendo mostrado
-				atributo_misc:DeadAtualizarBarra (mortes[i], qual_barra, i, instancia)
-				qual_barra = qual_barra+1
+				if (mortes[i]) then --> correção para um raro e desconhecido problema onde mortes[i] é nil
+					atributo_misc:DeadAtualizarBarra (mortes[i], qual_barra, i, instancia)
+					qual_barra = qual_barra+1
+				end
 			end
 			
 		elseif (instancia.bars_sort_direction == 2) then