- Fixed ticket #51: API Call 'GetCombat("overall")' wasn't returning the overall combat object.

- Fixed ticket #50: issue opening icon selection frame.
- Added 'spinal healing injector' on custom display 'Health Potion & Stone'.

classes/classe_custom.lua

@@ -1378,7 +1378,7 @@
 				local AllSpells = character:GetSpellList()
 				local found = false
 				for spellid, spell in pairs (AllSpells) do
-					if (spellid == 6262 or spellid == 156445 or spellid == 156438) then --healthstone, reju potion, health potion
+					if (spellid == 6262 or spellid == 156445 or spellid == 156438 or spellid == 82184) then --healthstone, reju potion, health potion, spinal healing injector
 						instance_container:AddValue (character, spell.total)
 						total = total + spell.total
 						if (top < spell.total) then
@@ -1424,12 +1424,19 @@
 				GameCooltip:AddIcon (select (3, GetSpellInfo (156438)), 1, 1, 16, 16)
 				GameCooltip:AddStatusBar (100, 1, R, G, B, A)
 			end
+			
+			local injector = actor:GetSpell (82184)
+			if (injector) then
+				GameCooltip:AddLine (select (1, GetSpellInfo(82184)),  _detalhes:ToK(injector.total))
+				GameCooltip:AddIcon (select (3, GetSpellInfo (82184)), 1, 1, 16, 16)
+				GameCooltip:AddStatusBar (100, 1, R, G, B, A)
+			end
 
 			--Cooltip code
 			]],
 			percent_script = false,
 			total_script = false,
-			script_version = 9,
+			script_version = 10,
 		}
 --	/run _detalhes:AddDefaultCustomDisplays()
 		local have = false
@@ -1593,7 +1600,7 @@
 			desc = "Show the crowd control amount for each player.",
 			source = false,
 			target = false,
-			script_version = 7,
+			script_version = 8,
 			script = [[
 				local combat, instance_container, instance = ...
 				local total, top, amount = 0, 0, 0

core/parser.lua

@@ -3775,7 +3775,7 @@
 			return _current_combat
 		elseif (_type (_combat) == "number") then
 			if (_combat == -1) then --> overall
-				return _overall_combat
+				return _detalhes.tabela_overall
 			elseif (_combat == 0) then --> current
 				return _current_combat
 			else
@@ -3783,7 +3783,7 @@
 			end
 		elseif (_type (_combat) == "string") then
 			if (_combat == "overall") then
-				return _overall_combat
+				return _detalhes.tabela_overall
 			elseif (_combat == "current") then
 				return _current_combat
 			end

core/util.lua

@@ -140,7 +140,11 @@
 	end
 	-- thanks http://richard.warburton.it
 	function _detalhes:comma_value (n)
+		if (not n) then return "0" end
 		n = _math_floor (n)
+		if (n == 0) then
+			return "0"
+		end
 		local left,num,right = _string_match (n,'^([^%d]*%d)(%d*)(.-)$')
 		return left..(num:reverse():gsub('(%d%d%d)','%1,'):reverse())..right
 	end

framework/panel.lua

@@ -1126,7 +1126,7 @@ function gump:IconPick (callback, close_when_select, param1, param2)
 		gump.IconPickFrame.preview.icon = preview_image
 		gump.IconPickFrame.preview:Hide()
 		
-		gump.IconPickFrame.searchLabel =  gump:NewLabel (gump.IconPickFrame, nil, "$parentSearchBoxLabel", nil, "search:", font, size, color)
+		gump.IconPickFrame.searchLabel =  gump:NewLabel (gump.IconPickFrame, nil, "$parentSearchBoxLabel", nil, "search:")
 		gump.IconPickFrame.searchLabel:SetPoint ("topleft", gump.IconPickFrame, "topleft", 12, -20)
 		gump.IconPickFrame.search = gump:NewTextEntry (gump.IconPickFrame, nil, "$parentSearchBox", nil, 140, 20)
 		gump.IconPickFrame.search:SetPoint ("left", gump.IconPickFrame.searchLabel, "right", 2, 0)