- Fixed tooltips where sometimes it wans't showing at all.

- Fixed the healing done amount on Malkorok encounter.
This commit is contained in:
tercio
2014-10-15 11:30:41 -03:00
parent c4d8cddc1f
commit 9925f2616b
5 changed files with 40 additions and 21 deletions
+11 -5
View File
@@ -839,12 +839,18 @@ end
end
--> get the full nicktag table
function NickTag:GetNicknameTable (serial)
function NickTag:GetNicknameTable (serial, silent)
--> check data before
assert (serial, "NickTag 'Get' expects a number on #1 argument.")
if (not silent) then
assert (serial, "NickTag 'Get' expects a number on #1 argument.")
else
if (not serial) then
return
end
end
if (type (serial) == "string") then
serial = NickTag:GetSerial (serial)
serial = NickTag:GetSerial (serial, silent)
if (not serial) then
return
end
@@ -914,11 +920,11 @@ end
else
if (not silent) then
assert (type (serial) == "string", "NickTag 'GetSerial' expects a GUID string on #1 parameter"..serial)
assert (string.len (serial) > 17, "NickTag 'GetSerial' expects a GUID string on #1 parameter")
assert (string.len (serial) > 13, "NickTag 'GetSerial' expects a GUID string on #1 parameter")
else
if (type (serial) ~= "string") then
return
elseif (string.len (serial) < 16) then
elseif (string.len (serial) < 14) then
return
end
end
+6 -3
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1026,7 +1026,7 @@
if (t) then
if (esta_barra.minha_tabela.serial and esta_barra.minha_tabela.serial ~= "") then
local avatar = NickTag:GetNicknameTable (esta_barra.minha_tabela.serial)
local avatar = NickTag:GetNicknameTable (esta_barra.minha_tabela.serial, true)
if (avatar) then
if (avatar [2] and avatar [4] and avatar [1]) then
GameCooltip:SetBannerImage (1, avatar [2], 80, 40, avatarPoint, avatarTexCoord, nil) --> overlay [2] avatar path
+21 -11
View File
@@ -595,17 +595,23 @@
-----------------------------------------------------------------------------------------------------------------------------------------
--> HEALING serach key: ~heal |
-----------------------------------------------------------------------------------------------------------------------------------------
local gotit = {
[140468]=true, --Flameglow Mage
[122470]=true, --touch of karma Monk
[114556]=true, --purgatory DK
[152280]=true, --defile DK
[20711]=true, --spirit of redeption priest
[155783]=true, --Primal Tenacity Druid
[135597]=true, --Tooth and Claw Druid
[152261]=true, --Holy Shield Paladin
[158708]=true, --Earthen Barrier boss?
}
local gotit = {
[140468]=true, --Flameglow Mage
[122470]=true, --touch of karma Monk
[114556]=true, --purgatory DK
[152280]=true, --defile DK
[20711]=true, --spirit of redeption priest
[155783]=true, --Primal Tenacity Druid
[135597]=true, --Tooth and Claw Druid
[152261]=true, --Holy Shield Paladin
[158708]=true, --Earthen Barrier boss?
}
local ignored_shields = {
[142862] = true --Ancient Barrier Malkorok
}
function parser:heal_absorb (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount)
@@ -613,6 +619,10 @@ local gotit = {
owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount = spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid
end
if (ignored_shields [shieldid]) then
return
end
--if (not absorb_spell_list [shieldid] and not gotit[shieldid]) then
-- local _, class = UnitClass (owner_name)
--print ("Shield Not Registered:", shieldid, shieldname, class)
@@ -167,7 +167,7 @@ local function CreatePluginFrames (data)
end
local whisper_table = EncounterDetails.current_whisper_table
if (_combat_object.is_boss and _combat_object.is_boss.name) then
if (whisper_table and _combat_object.is_boss and _combat_object.is_boss.name) then
whisper_table.boss = _combat_object.is_boss.name
tinsert (EncounterDetails.boss_emotes_table, 1, whisper_table)