Merging Seal of Command on Wrath classic
This commit is contained in:
+6
-6
@@ -215,7 +215,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
|
||||
f.OnProfileChanged = on_profile_changed
|
||||
f.LocTexts = texts
|
||||
options = options or {}
|
||||
self.table.deploy (options, aura_panel_defaultoptions)
|
||||
self.table.deploy(options, aura_panel_defaultoptions)
|
||||
|
||||
local f_auto = CreateFrame("frame", "$parent_Automatic", f, "BackdropTemplate")
|
||||
local f_manual = CreateFrame("frame", "$parent_Manual", f, "BackdropTemplate")
|
||||
@@ -228,7 +228,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
|
||||
|
||||
--check if the texts table is valid and also deploy default values into the table in case some value is nil
|
||||
texts = (type(texts == "table") and texts) or default_text_for_aura_frame
|
||||
DF.table.deploy (texts, default_text_for_aura_frame)
|
||||
DF.table.deploy(texts, default_text_for_aura_frame)
|
||||
|
||||
-------------
|
||||
|
||||
@@ -815,7 +815,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
|
||||
local icon = line:CreateTexture("$parentIcon", "overlay")
|
||||
icon:SetSize(lineHeight - 2, lineHeight - 2)
|
||||
|
||||
local name = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local name = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
DF:SetFontSize (name, 10)
|
||||
|
||||
local remove_button = CreateFrame("button", "$parentRemoveButton", line, "UIPanelCloseButton")
|
||||
@@ -995,7 +995,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
|
||||
local icon = line:CreateTexture("$parentIcon", "overlay")
|
||||
icon:SetSize(scroll_line_height - 2, scroll_line_height - 2)
|
||||
|
||||
local name = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local name = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
|
||||
local remove_button = CreateFrame("button", "$parentRemoveButton", line, "UIPanelCloseButton")
|
||||
remove_button:SetSize(16, 16)
|
||||
@@ -1085,7 +1085,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
|
||||
if (text ~= "") then
|
||||
--check for more than one spellname
|
||||
if (text:find (";")) then
|
||||
for _, spellName in ipairs({strsplit (";", text)}) do
|
||||
for _, spellName in ipairs({strsplit(";", text)}) do
|
||||
spellName = self:trim (spellName)
|
||||
local spellID = get_spellID_from_string (spellName)
|
||||
|
||||
@@ -1132,7 +1132,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t
|
||||
if (text ~= "") then
|
||||
--check for more than one spellname
|
||||
if (text:find (";")) then
|
||||
for _, spellName in ipairs({strsplit (";", text)}) do
|
||||
for _, spellName in ipairs({strsplit(";", text)}) do
|
||||
spellName = self:trim (spellName)
|
||||
local spellID = get_spellID_from_string (spellName)
|
||||
|
||||
|
||||
@@ -107,15 +107,6 @@ function DF.IsShadowlandsWow()
|
||||
end
|
||||
end
|
||||
|
||||
function DF.GetContainerItemInfo(containerIndex, slotIndex)
|
||||
if (DF.IsDragonflightAndBeyond()) then
|
||||
local itemInfo = C_Container.GetContainerItemInfo(containerIndex, slotIndex)
|
||||
return itemInfo.iconFileID, itemInfo.stackCount, itemInfo.isLocked, itemInfo.quality, itemInfo.isReadable, itemInfo.hasLoot, itemInfo.hyperlink, itemInfo.isFiltered, itemInfo.hasNoValue, itemInfo.itemID, itemInfo.isBound
|
||||
else
|
||||
return GetContainerItemInfo(containerIndex, slotIndex)
|
||||
end
|
||||
end
|
||||
|
||||
local roleBySpecTextureName = {
|
||||
DruidBalance = "DAMAGER",
|
||||
DruidFeralCombat = "DAMAGER",
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
|
||||
local detailsFramework = _G["DetailsFramework"]
|
||||
if (not detailsFramework or not DetailsFrameworkCanLoad) then
|
||||
return
|
||||
end
|
||||
|
||||
--namespace
|
||||
detailsFramework.Items = {}
|
||||
|
||||
local containerAPIVersion = 1
|
||||
if (detailsFramework.IsDragonflightAndBeyond()) then
|
||||
containerAPIVersion = 2
|
||||
end
|
||||
|
||||
function detailsFramework.Items.GetContainerItemInfo(containerIndex, slotIndex)
|
||||
if (containerAPIVersion == 2) then
|
||||
local itemInfo = C_Container.GetContainerItemInfo(containerIndex, slotIndex)
|
||||
return itemInfo.iconFileID, itemInfo.stackCount, itemInfo.isLocked, itemInfo.quality, itemInfo.isReadable, itemInfo.hasLoot, itemInfo.hyperlink, itemInfo.isFiltered, itemInfo.hasNoValue, itemInfo.itemID, itemInfo.isBound
|
||||
else
|
||||
return GetContainerItemInfo(containerIndex, slotIndex)
|
||||
end
|
||||
end
|
||||
|
||||
function detailsFramework.Items.IsItemSoulbound(containerIndex, slotIndex)
|
||||
local bIsBound = select(11, detailsFramework.Items.GetContainerItemInfo(containerIndex, slotIndex))
|
||||
return bIsBound
|
||||
end
|
||||
@@ -4,6 +4,7 @@
|
||||
<Script file="fw.lua"/>
|
||||
<Script file="mixins.lua"/>
|
||||
<Script file="util.lua"/>
|
||||
<Script file="iteminfo.lua"/>
|
||||
<Script file="addon.lua"/>
|
||||
<Script file="colors.lua"/>
|
||||
<Script file="help.lua"/>
|
||||
|
||||
+2
-2
@@ -253,8 +253,8 @@ detailsFramework.OptionsFunctions = {
|
||||
|
||||
BuildOptionsTable = function(self, defaultOptions, userOptions)
|
||||
self.options = self.options or {}
|
||||
detailsFramework.table.deploy (self.options, userOptions or {})
|
||||
detailsFramework.table.deploy (self.options, defaultOptions or {})
|
||||
detailsFramework.table.deploy(self.options, userOptions or {})
|
||||
detailsFramework.table.deploy(self.options, defaultOptions or {})
|
||||
end
|
||||
}
|
||||
|
||||
|
||||
@@ -738,12 +738,12 @@ local build_statusbar = function(self)
|
||||
self.sparktimer:SetBlendMode("ADD")
|
||||
self.sparktimer:Hide()
|
||||
|
||||
self.lefttext = self:CreateFontString ("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
|
||||
self.lefttext = self:CreateFontString("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
|
||||
self.lefttext:SetJustifyH("LEFT")
|
||||
self.lefttext:SetPoint("LEFT", self.icontexture, "RIGHT", 3, 0)
|
||||
DF:SetFontSize (self.lefttext, 10)
|
||||
|
||||
self.righttext = self:CreateFontString ("$parent_TextRight", "OVERLAY", "GameFontHighlight")
|
||||
self.righttext = self:CreateFontString("$parent_TextRight", "OVERLAY", "GameFontHighlight")
|
||||
self.righttext:SetJustifyH("LEFT")
|
||||
DF:SetFontSize (self.righttext, 10)
|
||||
self.righttext:SetPoint("RIGHT", self, "RIGHT", -3, 0)
|
||||
|
||||
+738
-743
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -566,7 +566,7 @@ DF:Mixin(DFSliderMetaFunctions, DF.FrameMixin)
|
||||
|
||||
local do_precision = function(text)
|
||||
if (type(text) == "string" and text:find ("%.")) then
|
||||
local left, right = strsplit (".", text)
|
||||
local left, right = strsplit(".", text)
|
||||
left = tonumber (left)
|
||||
right = tonumber (right)
|
||||
|
||||
@@ -958,7 +958,7 @@ function DF:NewSwitch (parent, container, name, member, w, h, ltext, rtext, defa
|
||||
thumb:SetAlpha(0.7)
|
||||
thumb:SetPoint("left", slider.widget, "left")
|
||||
|
||||
local text = slider:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local text = slider:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
text:SetTextColor (.8, .8, .8, 1)
|
||||
text:SetPoint("center", thumb, "center")
|
||||
|
||||
@@ -1158,7 +1158,7 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
|
||||
SliderObject.have_tooltip = "Right Click to Type the Value"
|
||||
end
|
||||
|
||||
SliderObject.amt = SliderObject.slider:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
SliderObject.amt = SliderObject.slider:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
|
||||
local amt = defaultv
|
||||
if (amt < 10 and amt >= 1) then
|
||||
|
||||
@@ -692,12 +692,12 @@ local build_statusbar = function(self)
|
||||
self.spark:SetSize(32, 32)
|
||||
self.spark:SetPoint("LEFT", self, "RIGHT", -17, -1)
|
||||
|
||||
self.lefttext = self:CreateFontString ("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
|
||||
self.lefttext = self:CreateFontString("$parent_TextLeft", "OVERLAY", "GameFontHighlight")
|
||||
DF:SetFontSize (self.lefttext, 10)
|
||||
self.lefttext:SetJustifyH("left")
|
||||
self.lefttext:SetPoint("LEFT", self.lefticon, "RIGHT", 3, 0)
|
||||
|
||||
self.righttext = self:CreateFontString ("$parent_TextRight", "OVERLAY", "GameFontHighlight")
|
||||
self.righttext = self:CreateFontString("$parent_TextRight", "OVERLAY", "GameFontHighlight")
|
||||
DF:SetFontSize (self.righttext, 10)
|
||||
self.righttext:SetJustifyH("right")
|
||||
self.righttext:SetPoint("RIGHT", self.righticon, "LEFT", -3, 0)
|
||||
|
||||
@@ -569,7 +569,7 @@ function DF:NewTextEntry(parent, container, name, member, w, h, func, param1, pa
|
||||
TextEntryObject.editbox:SetSize(232, 20)
|
||||
TextEntryObject.editbox:SetBackdrop({bgFile = [["Interface\DialogFrame\UI-DialogBox-Background"]], tileSize = 64, tile = true, edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]], edgeSize = 10, insets = {left = 1, right = 1, top = 0, bottom = 0}})
|
||||
|
||||
TextEntryObject.editbox.label = TextEntryObject.editbox:CreateFontString ("$parent_Desc", "OVERLAY", "GameFontHighlightSmall")
|
||||
TextEntryObject.editbox.label = TextEntryObject.editbox:CreateFontString("$parent_Desc", "OVERLAY", "GameFontHighlightSmall")
|
||||
TextEntryObject.editbox.label:SetJustifyH("left")
|
||||
TextEntryObject.editbox.label:SetPoint("RIGHT", TextEntryObject.editbox, "LEFT", -2, 0)
|
||||
|
||||
|
||||
@@ -853,7 +853,7 @@ do
|
||||
background_texture:SetTexture(NickTag.background_pool[1][1])
|
||||
background_texture:SetTexCoord (unpack(NickTag.background_pool[1][3]))
|
||||
--
|
||||
local name = avatar_pick_frame:CreateFontString ("AvatarPickFrameName", "overlay", "GameFontHighlightHuge")
|
||||
local name = avatar_pick_frame:CreateFontString("AvatarPickFrameName", "overlay", "GameFontHighlightHuge")
|
||||
name:SetPoint("left", avatar_texture, "right", -11, -17)
|
||||
name:SetText(UnitName ("player"))
|
||||
---
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--local pointers
|
||||
local ipairs = ipairs -- lua local
|
||||
local _pairs = pairs -- lua local
|
||||
local pairs = pairs -- lua local
|
||||
local _bit_band = bit.band -- lua local
|
||||
local _date = date -- lua local
|
||||
local tremove = table.remove -- lua local
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
local _cstr = string.format --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local _table_sort = table.sort --lua local
|
||||
local _table_insert = table.insert --lua local
|
||||
local tinsert = table.insert --lua local
|
||||
local _table_size = table.getn --lua local
|
||||
local _setmetatable = setmetatable --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _rawget= rawget --lua local
|
||||
local _math_min = math.min --lua local
|
||||
local _math_max = math.max --lua local
|
||||
@@ -26,9 +26,9 @@
|
||||
local _pcall = pcall -- lua local
|
||||
|
||||
local _GetSpellInfo = _detalhes.getspellinfo -- api local
|
||||
local _IsInRaid = IsInRaid -- api local
|
||||
local _IsInGroup = IsInGroup -- api local
|
||||
local _GetNumGroupMembers = GetNumGroupMembers -- api local
|
||||
local IsInRaid = IsInRaid -- api local
|
||||
local IsInGroup = IsInGroup -- api local
|
||||
local GetNumGroupMembers = GetNumGroupMembers -- api local
|
||||
local _GetNumPartyMembers = GetNumPartyMembers or GetNumSubgroupMembers -- api local
|
||||
local _GetNumRaidMembers = GetNumRaidMembers or GetNumGroupMembers -- api local
|
||||
local _GetUnitName = GetUnitName -- api local
|
||||
@@ -394,7 +394,7 @@
|
||||
local use_total_bar = false
|
||||
if (instance.total_bar.enabled) then
|
||||
use_total_bar = true
|
||||
if (instance.total_bar.only_in_group and (not _IsInGroup() and not _IsInRaid())) then
|
||||
if (instance.total_bar.only_in_group and (not IsInGroup() and not IsInRaid())) then
|
||||
use_total_bar = false
|
||||
end
|
||||
end
|
||||
|
||||
+86
-86
@@ -12,12 +12,12 @@
|
||||
local format = string.format --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local _table_sort = table.sort --lua local
|
||||
local _table_insert = table.insert --lua local
|
||||
local tinsert = table.insert --lua local
|
||||
local _table_size = table.getn --lua local
|
||||
local _setmetatable = setmetatable --lua local
|
||||
local _getmetatable = getmetatable --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _rawget= rawget --lua local
|
||||
local _math_min = math.min --lua local
|
||||
local _math_max = math.max --lua local
|
||||
@@ -26,8 +26,8 @@
|
||||
local unpack = unpack --lua local
|
||||
local type = type --lua local
|
||||
local GameTooltip = GameTooltip --api local
|
||||
local _IsInRaid = IsInRaid --api local
|
||||
local _IsInGroup = IsInGroup --api local
|
||||
local IsInRaid = IsInRaid --api local
|
||||
local IsInGroup = IsInGroup --api local
|
||||
|
||||
local GetSpellInfo = GetSpellInfo --api local
|
||||
local _GetSpellInfo = Details.getspellinfo --details api
|
||||
@@ -1038,7 +1038,7 @@ end
|
||||
local total_damage_taken = frag_actor.damage_taken
|
||||
local total = 0
|
||||
|
||||
for aggressor, _ in _pairs(took_damage_from) do
|
||||
for aggressor, _ in pairs(took_damage_from) do
|
||||
|
||||
local damager_actor = damage_container._ActorTable [damage_container._NameIndexTable [ aggressor ]]
|
||||
|
||||
@@ -1423,7 +1423,7 @@ end
|
||||
|
||||
local container = actor.debuff_uptime_targets
|
||||
|
||||
for target_name, debuff_table in _pairs(container) do
|
||||
for target_name, debuff_table in pairs(container) do
|
||||
if (alvos) then
|
||||
local damage_alvo = alvos [target_name]
|
||||
if (damage_alvo) then
|
||||
@@ -1444,7 +1444,7 @@ end
|
||||
end
|
||||
|
||||
local i = 1
|
||||
for target_name, debuff_table in _pairs(container) do
|
||||
for target_name, debuff_table in pairs(container) do
|
||||
local t = tooltip_void_zone_temp [i]
|
||||
if (not t) then
|
||||
t = {}
|
||||
@@ -1469,7 +1469,7 @@ end
|
||||
Details:AddTooltipHeaderStatusbar (1, 1, 1, 0.5)
|
||||
GameCooltip:AddIcon ([[Interface\AddOns\Details\images\key_shift]], 1, 2, Details.tooltip_key_size_width, Details.tooltip_key_size_height, 0, 1, 0, 0.640625, Details.tooltip_key_overlay2)
|
||||
|
||||
--for target_name, debuff_table in _pairs(container) do
|
||||
--for target_name, debuff_table in pairs(container) do
|
||||
local first = tooltip_void_zone_temp [1] and tooltip_void_zone_temp [1][3]
|
||||
if (type(first) == "table") then
|
||||
first = first.damage
|
||||
@@ -1729,7 +1729,7 @@ function atributo_damage:RefreshWindow (instancia, combatObject, forcar, exporta
|
||||
local frags_total_kills = 0
|
||||
local index = 0
|
||||
|
||||
for fragName, fragAmount in _pairs(frags) do
|
||||
for fragName, fragAmount in pairs(frags) do
|
||||
|
||||
index = index + 1
|
||||
|
||||
@@ -1965,7 +1965,7 @@ function atributo_damage:RefreshWindow (instancia, combatObject, forcar, exporta
|
||||
--fix spell, sometimes there is two spells with the same name, one is the cast and other is the debuff
|
||||
if (spell.total == 0 and not actor.damage_spellid_fixed) then
|
||||
local curname = _GetSpellInfo(actor.damage_spellid)
|
||||
for spellid, spelltable in _pairs(twin_damage_actor.spells._ActorTable) do
|
||||
for spellid, spelltable in pairs(twin_damage_actor.spells._ActorTable) do
|
||||
if (spelltable.total > spell.total) then
|
||||
local name = _GetSpellInfo(spellid)
|
||||
if (name == curname) then
|
||||
@@ -1984,7 +1984,7 @@ function atributo_damage:RefreshWindow (instancia, combatObject, forcar, exporta
|
||||
--fix spell, if the spellid passed for debuff uptime is actully the spell id of a ability and not if the aura it self
|
||||
actor.damage_spellid_fixed = true
|
||||
local found = false
|
||||
for spellid, spelltable in _pairs(twin_damage_actor.spells._ActorTable) do
|
||||
for spellid, spelltable in pairs(twin_damage_actor.spells._ActorTable) do
|
||||
local name = _GetSpellInfo(spellid)
|
||||
if (actor.damage_twin:find (name)) then
|
||||
actor.damage = spelltable.total
|
||||
@@ -2231,7 +2231,7 @@ function atributo_damage:RefreshWindow (instancia, combatObject, forcar, exporta
|
||||
if (instancia.total_bar.enabled) then
|
||||
useTotalBar = true
|
||||
|
||||
if (instancia.total_bar.only_in_group and (not _IsInGroup() and not _IsInRaid())) then
|
||||
if (instancia.total_bar.only_in_group and (not IsInGroup() and not IsInRaid())) then
|
||||
useTotalBar = false
|
||||
end
|
||||
|
||||
@@ -3186,7 +3186,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
|
||||
end
|
||||
|
||||
--add actor spells
|
||||
for _spellid, _skill in _pairs(ActorSkillsContainer) do
|
||||
for _spellid, _skill in pairs(ActorSkillsContainer) do
|
||||
ActorSkillsSortTable [#ActorSkillsSortTable+1] = {_spellid, _skill.total, _skill.total/meu_tempo}
|
||||
if (_skill.isReflection) then
|
||||
reflectionSpells[#reflectionSpells+1] = _skill
|
||||
@@ -3197,7 +3197,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
|
||||
for petIndex, petName in ipairs(self:Pets()) do
|
||||
local petActor = instancia.showing[class_type]:PegarCombatente (nil, petName)
|
||||
if (petActor) then
|
||||
for _spellid, _skill in _pairs(petActor:GetActorSpells()) do
|
||||
for _spellid, _skill in pairs(petActor:GetActorSpells()) do
|
||||
ActorSkillsSortTable [#ActorSkillsSortTable+1] = {_spellid, _skill.total, _skill.total/meu_tempo, petName:gsub ((" <.*"), "")}
|
||||
end
|
||||
end
|
||||
@@ -3210,7 +3210,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
|
||||
local ActorTargetsSortTable = {}
|
||||
|
||||
--add
|
||||
for target_name, amount in _pairs(self.targets) do
|
||||
for target_name, amount in pairs(self.targets) do
|
||||
ActorTargetsSortTable [#ActorTargetsSortTable+1] = {target_name, amount}
|
||||
end
|
||||
--sort
|
||||
@@ -3364,17 +3364,17 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
|
||||
end
|
||||
totais [#totais+1] = {nome, my_self.total_without_pet, my_self.total_without_pet/meu_tempo}
|
||||
|
||||
for spellid, tabela in _pairs(tabela) do
|
||||
for spellid, tabela in pairs(tabela) do
|
||||
local nome, rank, icone = _GetSpellInfo(spellid)
|
||||
_table_insert (meus_danos, {spellid, tabela.total, tabela.total/meu_total*100, {nome, rank, icone}})
|
||||
tinsert (meus_danos, {spellid, tabela.total, tabela.total/meu_total*100, {nome, rank, icone}})
|
||||
end
|
||||
_table_sort(meus_danos, Details.Sort2)
|
||||
danos [nome] = meus_danos
|
||||
|
||||
local meus_inimigos = {}
|
||||
tabela = my_self.targets
|
||||
for target_name, amount in _pairs(tabela) do
|
||||
_table_insert (meus_inimigos, {target_name, amount, amount/meu_total*100})
|
||||
for target_name, amount in pairs(tabela) do
|
||||
tinsert (meus_inimigos, {target_name, amount, amount/meu_total*100})
|
||||
end
|
||||
_table_sort(meus_inimigos,Details.Sort2)
|
||||
alvos [nome] = meus_inimigos
|
||||
@@ -3690,7 +3690,7 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown)
|
||||
else
|
||||
|
||||
--aggressors
|
||||
for nome, _ in _pairs(agressores) do --who damaged the player
|
||||
for nome, _ in pairs(agressores) do --who damaged the player
|
||||
--get the aggressor
|
||||
local este_agressor = showing._ActorTable [showing._NameIndexTable [nome]]
|
||||
if (este_agressor) then --checagem por causa do total e do garbage collector que n�o limpa os nomes que deram dano
|
||||
@@ -3775,7 +3775,7 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown)
|
||||
|
||||
local all_spells = {}
|
||||
|
||||
for spellid, spell in _pairs(aggressor.spells._ActorTable) do
|
||||
for spellid, spell in pairs(aggressor.spells._ActorTable) do
|
||||
local on_target = spell.targets [self.nome]
|
||||
if (on_target) then
|
||||
tinsert(all_spells, {spellid, on_target, aggressor.nome})
|
||||
@@ -3785,7 +3785,7 @@ function atributo_damage:ToolTip_DamageTaken (instancia, numero, barra, keydown)
|
||||
--friendly fire
|
||||
local friendlyFire = aggressor.friendlyfire [self.nome]
|
||||
if (friendlyFire) then
|
||||
for spellid, amount in _pairs(friendlyFire.spells) do
|
||||
for spellid, amount in pairs(friendlyFire.spells) do
|
||||
tinsert(all_spells, {spellid, amount, aggressor.nome})
|
||||
end
|
||||
end
|
||||
@@ -3865,11 +3865,11 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown
|
||||
local DamagedPlayers = {}
|
||||
local Skills = {}
|
||||
|
||||
for target_name, ff_table in _pairs(FriendlyFire) do
|
||||
for target_name, ff_table in pairs(FriendlyFire) do
|
||||
local actor = combat (1, target_name)
|
||||
if (actor) then
|
||||
DamagedPlayers [#DamagedPlayers+1] = {target_name, ff_table.total, actor.classe}
|
||||
for spellid, amount in _pairs(ff_table.spells) do
|
||||
for spellid, amount in pairs(ff_table.spells) do
|
||||
Skills [spellid] = (Skills [spellid] or 0) + amount
|
||||
end
|
||||
end
|
||||
@@ -3937,7 +3937,7 @@ function atributo_damage:ToolTip_FriendlyFire (instancia, numero, barra, keydown
|
||||
|
||||
--spells usadas no friendly fire
|
||||
local SpellsInOrder = {}
|
||||
for spellID, amount in _pairs(Skills) do
|
||||
for spellID, amount in pairs(Skills) do
|
||||
SpellsInOrder [#SpellsInOrder+1] = {spellID, amount}
|
||||
end
|
||||
_table_sort(SpellsInOrder, Details.Sort2)
|
||||
@@ -3999,13 +3999,13 @@ function atributo_damage:MontaInfoFriendlyFire()
|
||||
local DamagedPlayers = {}
|
||||
local Skills = {}
|
||||
|
||||
for target_name, ff_table in _pairs(self.friendlyfire) do
|
||||
for target_name, ff_table in pairs(self.friendlyfire) do
|
||||
|
||||
local actor = combat (1, target_name)
|
||||
if (actor) then
|
||||
_table_insert (DamagedPlayers, {target_name, ff_table.total, ff_table.total / FriendlyFireTotal * 100, actor.classe})
|
||||
tinsert (DamagedPlayers, {target_name, ff_table.total, ff_table.total / FriendlyFireTotal * 100, actor.classe})
|
||||
|
||||
for spellid, amount in _pairs(ff_table.spells) do
|
||||
for spellid, amount in pairs(ff_table.spells) do
|
||||
Skills [spellid] = (Skills [spellid] or 0) + amount
|
||||
end
|
||||
end
|
||||
@@ -4084,7 +4084,7 @@ function atributo_damage:MontaInfoFriendlyFire()
|
||||
end
|
||||
|
||||
local SkillTable = {}
|
||||
for spellid, amt in _pairs(Skills) do
|
||||
for spellid, amt in pairs(Skills) do
|
||||
local nome, _, icone = _GetSpellInfo(spellid)
|
||||
SkillTable [#SkillTable+1] = {nome, amt, amt/FriendlyFireTotal*100, icone}
|
||||
end
|
||||
@@ -4137,7 +4137,7 @@ function atributo_damage:MontaInfoDamageTaken()
|
||||
local meus_agressores = {}
|
||||
|
||||
local este_agressor
|
||||
for nome, _ in _pairs(agressores) do
|
||||
for nome, _ in pairs(agressores) do
|
||||
este_agressor = showing._ActorTable[showing._NameIndexTable[nome]]
|
||||
if (este_agressor) then
|
||||
local alvos = este_agressor.targets
|
||||
@@ -4306,10 +4306,10 @@ function atributo_damage:MontaInfoDamageDone()
|
||||
meu_tempo = info.instancia.showing:GetCombatTime()
|
||||
end
|
||||
|
||||
for _spellid, _skill in _pairs(ActorSkillsContainer) do --da foreach em cada spellid do container
|
||||
for _spellid, _skill in pairs(ActorSkillsContainer) do --da foreach em cada spellid do container
|
||||
local nome, _, icone = _GetSpellInfo(_spellid)
|
||||
if (nome) then
|
||||
_table_insert (ActorSkillsSortTable, {_spellid, _skill.total, _skill.total/ActorTotalDamage*100, nome, icone, nil, _skill.spellschool})
|
||||
tinsert (ActorSkillsSortTable, {_spellid, _skill.total, _skill.total/ActorTotalDamage*100, nome, icone, nil, _skill.spellschool})
|
||||
end
|
||||
end
|
||||
|
||||
@@ -4347,11 +4347,11 @@ function atributo_damage:MontaInfoDamageDone()
|
||||
local PetActor = instancia.showing (class_type, PetName)
|
||||
if (PetActor) then
|
||||
local PetSkillsContainer = PetActor.spells._ActorTable
|
||||
for _spellid, _skill in _pairs(PetSkillsContainer) do --da foreach em cada spellid do container
|
||||
for _spellid, _skill in pairs(PetSkillsContainer) do --da foreach em cada spellid do container
|
||||
local nome, _, icone = _GetSpellInfo(_spellid)
|
||||
--_table_insert (ActorSkillsSortTable, {_spellid, _skill.total, _skill.total/ActorTotalDamage*100, nome .. " |TInterface\\AddOns\\Details\\images\\classes_small_alpha:12:12:0:0:128:128:33:64:96:128|t|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r", icone, PetActor, _skill.spellschool})
|
||||
--tinsert (ActorSkillsSortTable, {_spellid, _skill.total, _skill.total/ActorTotalDamage*100, nome .. " |TInterface\\AddOns\\Details\\images\\classes_small_alpha:12:12:0:0:128:128:33:64:96:128|t|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r", icone, PetActor, _skill.spellschool})
|
||||
if (nome) then
|
||||
_table_insert (ActorSkillsSortTable, {_spellid, _skill.total, _skill.total/ActorTotalDamage*100, nome .. " (|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r)", icone, PetActor, _skill.spellschool})
|
||||
tinsert (ActorSkillsSortTable, {_spellid, _skill.total, _skill.total/ActorTotalDamage*100, nome .. " (|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r)", icone, PetActor, _skill.spellschool})
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -4411,7 +4411,7 @@ function atributo_damage:MontaInfoDamageDone()
|
||||
local meus_agressores = {}
|
||||
|
||||
local este_agressor
|
||||
for nome, _ in _pairs(agressores) do
|
||||
for nome, _ in pairs(agressores) do
|
||||
este_agressor = showing._ActorTable[showing._NameIndexTable[nome]]
|
||||
if (este_agressor) then
|
||||
local este_alvo = este_agressor.targets [self.nome]
|
||||
@@ -4493,8 +4493,8 @@ function atributo_damage:MontaInfoDamageDone()
|
||||
|
||||
--my target container
|
||||
conteudo = self.targets
|
||||
for target_name, amount in _pairs(conteudo) do
|
||||
_table_insert (meus_inimigos, {target_name, amount, amount/total*100})
|
||||
for target_name, amount in pairs(conteudo) do
|
||||
tinsert (meus_inimigos, {target_name, amount, amount/total*100})
|
||||
end
|
||||
|
||||
--sort
|
||||
@@ -4590,9 +4590,9 @@ function atributo_damage:MontaDetalhesFriendlyFire (nome, barra)
|
||||
|
||||
local minhas_magias = {}
|
||||
|
||||
for spellid, amount in _pairs(ff_table.spells) do --da foreach em cada spellid do container
|
||||
for spellid, amount in pairs(ff_table.spells) do --da foreach em cada spellid do container
|
||||
local nome, _, icone = _GetSpellInfo(spellid)
|
||||
_table_insert (minhas_magias, {spellid, amount, amount / total * 100, nome, icone})
|
||||
tinsert (minhas_magias, {spellid, amount, amount / total * 100, nome, icone})
|
||||
end
|
||||
|
||||
_table_sort(minhas_magias, Details.Sort2)
|
||||
@@ -4658,7 +4658,7 @@ function atributo_damage:MontaDetalhesEnemy (spellid, barra)
|
||||
local targets = spell.targets
|
||||
local target_pool = {}
|
||||
|
||||
for target_name, amount in _pairs(targets) do
|
||||
for target_name, amount in pairs(targets) do
|
||||
local classe
|
||||
local this_actor = info.instancia.showing (1, target_name)
|
||||
if (this_actor) then
|
||||
@@ -4741,7 +4741,7 @@ function atributo_damage:MontaDetalhesDamageTaken (nome, barra)
|
||||
return
|
||||
end
|
||||
|
||||
local conteudo = este_agressor.spells._ActorTable --_pairs[] com os IDs das magias
|
||||
local conteudo = este_agressor.spells._ActorTable --pairs[] com os IDs das magias
|
||||
|
||||
local actor = info.jogador.nome
|
||||
|
||||
@@ -4749,11 +4749,11 @@ function atributo_damage:MontaDetalhesDamageTaken (nome, barra)
|
||||
|
||||
local minhas_magias = {}
|
||||
|
||||
for spellid, tabela in _pairs(conteudo) do --da foreach em cada spellid do container
|
||||
for spellid, tabela in pairs(conteudo) do --da foreach em cada spellid do container
|
||||
local este_alvo = tabela.targets [actor]
|
||||
if (este_alvo) then --esta magia deu dano no actor
|
||||
local spell_nome, rank, icone = _GetSpellInfo(spellid)
|
||||
_table_insert (minhas_magias, {spellid, este_alvo, este_alvo/total*100, spell_nome, icone})
|
||||
tinsert (minhas_magias, {spellid, este_alvo, este_alvo/total*100, spell_nome, icone})
|
||||
end
|
||||
end
|
||||
|
||||
@@ -4941,7 +4941,7 @@ function atributo_damage:MontaDetalhesDamageDone (spellid, barra, instancia)
|
||||
|
||||
if (not spell_cast and misc_actor.spell_cast) then
|
||||
local spellname = GetSpellInfo(spellid)
|
||||
for casted_spellid, amount in _pairs(misc_actor.spell_cast) do
|
||||
for casted_spellid, amount in pairs(misc_actor.spell_cast) do
|
||||
local casted_spellname = GetSpellInfo(casted_spellid)
|
||||
if (casted_spellname == spellname) then
|
||||
spell_cast = amount .. " (|cFFFFFF00?|r)"
|
||||
@@ -5145,8 +5145,8 @@ function atributo_damage:MontaTooltipDamageTaken (thisLine, index)
|
||||
|
||||
local total = 0
|
||||
|
||||
for spellid, spell in _pairs(container) do
|
||||
for target_name, amount in _pairs(spell.targets) do
|
||||
for spellid, spell in pairs(container) do
|
||||
for target_name, amount in pairs(spell.targets) do
|
||||
if (target_name == self.nome) then
|
||||
total = total + amount
|
||||
habilidades [#habilidades+1] = {spellid, amount}
|
||||
@@ -5185,11 +5185,11 @@ function atributo_damage:MontaTooltipAlvos (thisLine, index, instancia)
|
||||
GameCooltip:SetOwner(thisLine, "bottom", "top", 4, -2)
|
||||
GameCooltip:SetOption("MinWidth", _math_max (230, thisLine:GetWidth()*0.98))
|
||||
|
||||
for spellid, spell in _pairs(self.spells._ActorTable) do
|
||||
for spellid, spell in pairs(self.spells._ActorTable) do
|
||||
if (spell.isReflection) then
|
||||
for target_name, amount in _pairs(spell.targets) do
|
||||
for target_name, amount in pairs(spell.targets) do
|
||||
if (target_name == inimigo) then
|
||||
for reflectedSpellId, amount in _pairs(spell.extra) do
|
||||
for reflectedSpellId, amount in pairs(spell.extra) do
|
||||
local spellName, _, spellIcon = _GetSpellInfo(reflectedSpellId)
|
||||
local t = habilidades [i]
|
||||
if (not t) then
|
||||
@@ -5203,7 +5203,7 @@ function atributo_damage:MontaTooltipAlvos (thisLine, index, instancia)
|
||||
end
|
||||
end
|
||||
else
|
||||
for target_name, amount in _pairs(spell.targets) do
|
||||
for target_name, amount in pairs(spell.targets) do
|
||||
if (target_name == inimigo) then
|
||||
local nome, _, icone = _GetSpellInfo(spellid)
|
||||
|
||||
@@ -5225,10 +5225,10 @@ function atributo_damage:MontaTooltipAlvos (thisLine, index, instancia)
|
||||
local PetActor = instancia.showing (class_type, PetName)
|
||||
if (PetActor) then
|
||||
local PetSkillsContainer = PetActor.spells._ActorTable
|
||||
for _spellid, _skill in _pairs(PetSkillsContainer) do
|
||||
for _spellid, _skill in pairs(PetSkillsContainer) do
|
||||
|
||||
local alvos = _skill.targets
|
||||
for target_name, amount in _pairs(alvos) do
|
||||
for target_name, amount in pairs(alvos) do
|
||||
if (target_name == inimigo) then
|
||||
|
||||
local t = habilidades [i]
|
||||
@@ -5393,7 +5393,7 @@ end
|
||||
Details.refresh:r_atributo_damage (actor, shadow)
|
||||
|
||||
--copia o container de alvos (captura de dados)
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
--cria e soma o valor do total
|
||||
if (not shadow.targets [target_name]) then
|
||||
shadow.targets [target_name] = 0
|
||||
@@ -5401,19 +5401,19 @@ end
|
||||
end
|
||||
|
||||
--copia o container de habilidades (captura de dados)
|
||||
for spellid, habilidade in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(actor.spells._ActorTable) do
|
||||
--cria e soma o valor
|
||||
local habilidade_shadow = shadow.spells:PegaHabilidade (spellid, true, nil, true)
|
||||
|
||||
--create the target value
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
if (not habilidade_shadow.targets [target_name]) then
|
||||
habilidade_shadow.targets [target_name] = 0
|
||||
end
|
||||
end
|
||||
|
||||
--create the extra value
|
||||
for spellId, amount in _pairs(habilidade.extra) do
|
||||
for spellId, amount in pairs(habilidade.extra) do
|
||||
if (not habilidade_shadow.extra [spellId]) then
|
||||
habilidade_shadow.extra [spellId] = 0
|
||||
end
|
||||
@@ -5422,11 +5422,11 @@ end
|
||||
end
|
||||
|
||||
--copia o container de friendly fire (captura de dados)
|
||||
for target_name, ff_table in _pairs(actor.friendlyfire) do
|
||||
for target_name, ff_table in pairs(actor.friendlyfire) do
|
||||
--cria ou pega a shadow
|
||||
local friendlyFire_shadow = shadow.friendlyfire [target_name] or shadow:CreateFFTable (target_name)
|
||||
--some as spells
|
||||
for spellid, amount in _pairs(ff_table.spells) do
|
||||
for spellid, amount in pairs(ff_table.spells) do
|
||||
friendlyFire_shadow.spells [spellid] = 0
|
||||
end
|
||||
end
|
||||
@@ -5511,38 +5511,38 @@ end
|
||||
end
|
||||
|
||||
--copia o damage_from (captura de dados)
|
||||
for nome, _ in _pairs(actor.damage_from) do
|
||||
for nome, _ in pairs(actor.damage_from) do
|
||||
shadow.damage_from [nome] = true
|
||||
end
|
||||
|
||||
--copia o container de alvos (captura de dados)
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
shadow.targets [target_name] = (shadow.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--copiar o container de raid targets
|
||||
for flag, amount in _pairs(actor.raid_targets) do
|
||||
for flag, amount in pairs(actor.raid_targets) do
|
||||
shadow.raid_targets = shadow.raid_targets or {} --deu invalido noutro dia
|
||||
shadow.raid_targets [flag] = (shadow.raid_targets [flag] or 0) + amount
|
||||
end
|
||||
|
||||
--copia o container de habilidades (captura de dados)
|
||||
for spellid, habilidade in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(actor.spells._ActorTable) do
|
||||
--cria e soma o valor
|
||||
local habilidade_shadow = shadow.spells:PegaHabilidade (spellid, true, nil, true)
|
||||
|
||||
--refresh e soma os valores dos alvos
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
habilidade_shadow.targets [target_name] = (habilidade_shadow.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--refresh and add extra values
|
||||
for spellId, amount in _pairs(habilidade.extra) do
|
||||
for spellId, amount in pairs(habilidade.extra) do
|
||||
habilidade_shadow.extra [spellId] = (habilidade_shadow.extra [spellId] or 0) + amount
|
||||
end
|
||||
|
||||
--soma todos os demais valores
|
||||
for key, value in _pairs(habilidade) do
|
||||
for key, value in pairs(habilidade) do
|
||||
if (type(value) == "number") then
|
||||
if (key ~= "id" and key ~= "spellschool") then
|
||||
if (not habilidade_shadow [key]) then
|
||||
@@ -5567,13 +5567,13 @@ end
|
||||
end
|
||||
|
||||
--copia o container de friendly fire (captura de dados)
|
||||
for target_name, ff_table in _pairs(actor.friendlyfire) do
|
||||
for target_name, ff_table in pairs(actor.friendlyfire) do
|
||||
--cria ou pega a shadow
|
||||
local friendlyFire_shadow = shadow.friendlyfire [target_name] or shadow:CreateFFTable (target_name)
|
||||
--soma o total
|
||||
friendlyFire_shadow.total = friendlyFire_shadow.total + ff_table.total
|
||||
--some as spells
|
||||
for spellid, amount in _pairs(ff_table.spells) do
|
||||
for spellid, amount in pairs(ff_table.spells) do
|
||||
friendlyFire_shadow.spells [spellid] = (friendlyFire_shadow.spells [spellid] or 0) + amount
|
||||
end
|
||||
end
|
||||
@@ -5690,7 +5690,7 @@ atributo_damage.__add = function(tabela1, tabela2)
|
||||
tabela1.friendlyfire_total = tabela1.friendlyfire_total + tabela2.friendlyfire_total
|
||||
|
||||
--soma o damage_from
|
||||
for nome, _ in _pairs(tabela2.damage_from) do
|
||||
for nome, _ in pairs(tabela2.damage_from) do
|
||||
tabela1.damage_from [nome] = true
|
||||
end
|
||||
|
||||
@@ -5710,32 +5710,32 @@ atributo_damage.__add = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--soma os containers de alvos
|
||||
for target_name, amount in _pairs(tabela2.targets) do
|
||||
for target_name, amount in pairs(tabela2.targets) do
|
||||
tabela1.targets [target_name] = (tabela1.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--soma o container de raid targets
|
||||
for flag, amount in _pairs(tabela2.raid_targets) do
|
||||
for flag, amount in pairs(tabela2.raid_targets) do
|
||||
tabela1.raid_targets [flag] = (tabela1.raid_targets [flag] or 0) + amount
|
||||
end
|
||||
|
||||
--soma o container de habilidades
|
||||
for spellid, habilidade in _pairs(tabela2.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(tabela2.spells._ActorTable) do
|
||||
--pega a habilidade no primeiro ator
|
||||
local habilidade_tabela1 = tabela1.spells:PegaHabilidade (spellid, true, "SPELL_DAMAGE", false)
|
||||
|
||||
--soma os alvos
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
habilidade_tabela1.targets[target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--soma os extras
|
||||
for spellId, amount in _pairs(habilidade.extra) do
|
||||
for spellId, amount in pairs(habilidade.extra) do
|
||||
habilidade_tabela1.extra = (habilidade_tabela1.extra [spellId] or 0) + amount
|
||||
end
|
||||
|
||||
--soma os valores da habilidade
|
||||
for key, value in _pairs(habilidade) do
|
||||
for key, value in pairs(habilidade) do
|
||||
if (type(value) == "number") then
|
||||
if (key ~= "id" and key ~= "spellschool") then
|
||||
if (not habilidade_tabela1 [key]) then
|
||||
@@ -5760,14 +5760,14 @@ atributo_damage.__add = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--soma o container de friendly fire
|
||||
for target_name, ff_table in _pairs(tabela2.friendlyfire) do
|
||||
for target_name, ff_table in pairs(tabela2.friendlyfire) do
|
||||
--pega o ator ff no ator principal
|
||||
local friendlyFire_tabela1 = tabela1.friendlyfire [target_name] or tabela1:CreateFFTable (target_name)
|
||||
--soma o total
|
||||
friendlyFire_tabela1.total = friendlyFire_tabela1.total + ff_table.total
|
||||
|
||||
--soma as habilidades
|
||||
for spellid, amount in _pairs(ff_table.spells) do
|
||||
for spellid, amount in pairs(ff_table.spells) do
|
||||
friendlyFire_tabela1.spells [spellid] = (friendlyFire_tabela1.spells [spellid] or 0) + amount
|
||||
end
|
||||
end
|
||||
@@ -5793,7 +5793,7 @@ atributo_damage.__sub = function(tabela1, tabela2)
|
||||
tabela1.friendlyfire_total = tabela1.friendlyfire_total - tabela2.friendlyfire_total
|
||||
|
||||
--reduz os containers de alvos
|
||||
for target_name, amount in _pairs(tabela2.targets) do
|
||||
for target_name, amount in pairs(tabela2.targets) do
|
||||
local alvo_tabela1 = tabela1.targets [target_name]
|
||||
if (alvo_tabela1) then
|
||||
tabela1.targets [target_name] = tabela1.targets [target_name] - amount
|
||||
@@ -5801,19 +5801,19 @@ atributo_damage.__sub = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--reduz o container de raid targets
|
||||
for flag, amount in _pairs(tabela2.raid_targets) do
|
||||
for flag, amount in pairs(tabela2.raid_targets) do
|
||||
if (tabela1.raid_targets [flag]) then
|
||||
tabela1.raid_targets [flag] = _math_max (tabela1.raid_targets [flag] - amount, 0)
|
||||
end
|
||||
end
|
||||
|
||||
--reduz o container de habilidades
|
||||
for spellid, habilidade in _pairs(tabela2.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(tabela2.spells._ActorTable) do
|
||||
--get the spell from the first actor
|
||||
local habilidade_tabela1 = tabela1.spells:PegaHabilidade (spellid, true, "SPELL_DAMAGE", false)
|
||||
|
||||
--subtract targets
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
local alvo_tabela1 = habilidade_tabela1.targets [target_name]
|
||||
if (alvo_tabela1) then
|
||||
habilidade_tabela1.targets [target_name] = habilidade_tabela1.targets [target_name] - amount
|
||||
@@ -5821,7 +5821,7 @@ atributo_damage.__sub = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--subtract extra table
|
||||
for spellId, amount in _pairs(habilidade.extra) do
|
||||
for spellId, amount in pairs(habilidade.extra) do
|
||||
local extra_tabela1 = habilidade_tabela1.extra [spellId]
|
||||
if (extra_tabela1) then
|
||||
habilidade_tabela1.extra [spellId] = habilidade_tabela1.extra [spellId] - amount
|
||||
@@ -5829,7 +5829,7 @@ atributo_damage.__sub = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--subtrai os valores da habilidade
|
||||
for key, value in _pairs(habilidade) do
|
||||
for key, value in pairs(habilidade) do
|
||||
if (type(value) == "number") then
|
||||
if (key ~= "id" and key ~= "spellschool") then
|
||||
if (not habilidade_tabela1 [key]) then
|
||||
@@ -5852,12 +5852,12 @@ atributo_damage.__sub = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--reduz o container de friendly fire
|
||||
for target_name, ff_table in _pairs(tabela2.friendlyfire) do
|
||||
for target_name, ff_table in pairs(tabela2.friendlyfire) do
|
||||
--pega o ator ff no ator principal
|
||||
local friendlyFire_tabela1 = tabela1.friendlyfire [target_name]
|
||||
if (friendlyFire_tabela1) then
|
||||
friendlyFire_tabela1.total = friendlyFire_tabela1.total - ff_table.total
|
||||
for spellid, amount in _pairs(ff_table.spells) do
|
||||
for spellid, amount in pairs(ff_table.spells) do
|
||||
if (friendlyFire_tabela1.spells [spellid]) then
|
||||
friendlyFire_tabela1.spells [spellid] = friendlyFire_tabela1.spells [spellid] - amount
|
||||
end
|
||||
@@ -5895,7 +5895,7 @@ end
|
||||
local damage_done = 0
|
||||
|
||||
--get targets
|
||||
for target_name, amount in _pairs(enemy.targets) do
|
||||
for target_name, amount in pairs(enemy.targets) do
|
||||
local player = combat (1, target_name)
|
||||
if (player and player.grupo) then
|
||||
local t = tooltip_temp_table [i]
|
||||
|
||||
+87
-87
@@ -3,23 +3,23 @@
|
||||
local _cstr = string.format
|
||||
local _math_floor = math.floor
|
||||
local _setmetatable = setmetatable
|
||||
local _pairs = pairs
|
||||
local pairs = pairs
|
||||
local ipairs = ipairs
|
||||
local _unpack = unpack
|
||||
local type = type
|
||||
local _table_sort = table.sort
|
||||
local _cstr = string.format
|
||||
local _table_insert = table.insert
|
||||
local tinsert = table.insert
|
||||
local _bit_band = bit.band
|
||||
local _math_min = math.min
|
||||
local _math_ceil = math.ceil
|
||||
--api locals
|
||||
local GetSpellInfo = GetSpellInfo
|
||||
local _GetSpellInfo = _detalhes.getspellinfo
|
||||
local _IsInRaid = IsInRaid
|
||||
local _IsInGroup = IsInGroup
|
||||
local IsInRaid = IsInRaid
|
||||
local IsInGroup = IsInGroup
|
||||
local _UnitName = UnitName
|
||||
local _GetNumGroupMembers = GetNumGroupMembers
|
||||
local GetNumGroupMembers = GetNumGroupMembers
|
||||
|
||||
local _string_replace = _detalhes.string.replace --details api
|
||||
|
||||
@@ -419,7 +419,7 @@ function atributo_heal:RefreshWindow (instancia, tabela_do_combate, forcar, expo
|
||||
if (instancia.total_bar.enabled) then
|
||||
use_total_bar = true
|
||||
|
||||
if (instancia.total_bar.only_in_group and (not _IsInGroup() and not _IsInRaid())) then
|
||||
if (instancia.total_bar.only_in_group and (not IsInGroup() and not IsInRaid())) then
|
||||
use_total_bar = false
|
||||
end
|
||||
end
|
||||
@@ -970,15 +970,15 @@ function _detalhes:CloseShields(combat)
|
||||
local parser = _detalhes.parser
|
||||
local GetSpellInfo = GetSpellInfo --n�o colocar no cache de spells
|
||||
|
||||
for alvo_name, spellid_table in _pairs(escudos) do
|
||||
for alvo_name, spellid_table in pairs(escudos) do
|
||||
|
||||
local tgt = container:PegarCombatente (_, alvo_name)
|
||||
if (tgt) then
|
||||
|
||||
for spellid, owner_table in _pairs(spellid_table) do
|
||||
for spellid, owner_table in pairs(spellid_table) do
|
||||
|
||||
local spellname = GetSpellInfo(spellid)
|
||||
for owner, amount in _pairs(owner_table) do
|
||||
for owner, amount in pairs(owner_table) do
|
||||
|
||||
if (amount > 0) then
|
||||
local obj = container:PegarCombatente (_, owner)
|
||||
@@ -1045,23 +1045,23 @@ function atributo_heal:ToolTip_HealingDenied (instancia, numero, barra, keydown)
|
||||
local icon_size = _detalhes.tooltip.icon_size
|
||||
local icon_border = _detalhes.tooltip.icon_border_texcoord
|
||||
|
||||
for spellID, spell in _pairs(self.spells._ActorTable) do
|
||||
for spellID, spell in pairs(self.spells._ActorTable) do
|
||||
if (spell.totaldenied > 0 and spell.heal_denied) then
|
||||
--my spells which denied heal
|
||||
tinsert(spellList, {spell, spell.totaldenied})
|
||||
|
||||
--players affected
|
||||
for playerName, amount in _pairs(spell.targets) do
|
||||
for playerName, amount in pairs(spell.targets) do
|
||||
targetList [playerName] = (targetList [playerName] or 0) + amount
|
||||
end
|
||||
|
||||
--spells with heal denied
|
||||
for spellID, amount in _pairs(spell.heal_denied) do
|
||||
for spellID, amount in pairs(spell.heal_denied) do
|
||||
spellsDenied [spellID] = (spellsDenied [spellID] or 0) + amount
|
||||
end
|
||||
|
||||
--healers denied
|
||||
for healerName, amount in _pairs(spell.heal_denied_healers) do
|
||||
for healerName, amount in pairs(spell.heal_denied_healers) do
|
||||
healersDenied [healerName] = (healersDenied [healerName] or 0) + amount
|
||||
end
|
||||
end
|
||||
@@ -1106,7 +1106,7 @@ function atributo_heal:ToolTip_HealingDenied (instancia, numero, barra, keydown)
|
||||
|
||||
--Target Players
|
||||
local playerSorted = {}
|
||||
for playerName, amount in _pairs(targetList) do
|
||||
for playerName, amount in pairs(targetList) do
|
||||
tinsert(playerSorted, {playerName, amount})
|
||||
end
|
||||
table.sort (playerSorted, _detalhes.Sort2)
|
||||
@@ -1152,7 +1152,7 @@ function atributo_heal:ToolTip_HealingDenied (instancia, numero, barra, keydown)
|
||||
|
||||
-- Spells Affected
|
||||
local spellsSorted = {}
|
||||
for spellID, amount in _pairs(spellsDenied) do
|
||||
for spellID, amount in pairs(spellsDenied) do
|
||||
tinsert(spellsSorted, {spellID, amount})
|
||||
end
|
||||
table.sort (spellsSorted, _detalhes.Sort2)
|
||||
@@ -1189,7 +1189,7 @@ function atributo_heal:ToolTip_HealingDenied (instancia, numero, barra, keydown)
|
||||
_detalhes:AddTooltipHeaderStatusbar (r, g, b, barAlha)
|
||||
|
||||
local healersSorted = {}
|
||||
for healerName, amount in _pairs(healersDenied) do
|
||||
for healerName, amount in pairs(healersDenied) do
|
||||
tinsert(healersSorted, {healerName, amount})
|
||||
end
|
||||
table.sort (healersSorted, _detalhes.Sort2)
|
||||
@@ -1235,7 +1235,7 @@ function atributo_heal:ToolTip_HealingTaken (instancia, numero, barra, keydown)
|
||||
|
||||
local meus_curadores = {}
|
||||
|
||||
for nome, _ in _pairs(curadores) do --agressores seria a lista de nomes
|
||||
for nome, _ in pairs(curadores) do --agressores seria a lista de nomes
|
||||
local este_curador = showing._ActorTable[showing._NameIndexTable[nome]]
|
||||
if (este_curador) then --checagem por causa do total e do garbage collector que n�o limpa os nomes que deram dano
|
||||
local alvos = este_curador.targets
|
||||
@@ -1337,10 +1337,10 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
|
||||
local ActorTotal = self [actor_key]
|
||||
|
||||
--add actor spells
|
||||
for _spellid, _skill in _pairs(ActorSkillsContainer) do
|
||||
for _spellid, _skill in pairs(ActorSkillsContainer) do
|
||||
local SkillName, _, SkillIcon = _GetSpellInfo(_spellid)
|
||||
if (_skill [skill_key] > 0 or _skill.anti_heal) then
|
||||
_table_insert (ActorHealingTable, {
|
||||
tinsert (ActorHealingTable, {
|
||||
_spellid,
|
||||
_skill [skill_key],
|
||||
_skill [skill_key]/ActorTotal*100,
|
||||
@@ -1357,7 +1357,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
|
||||
for petIndex, petName in ipairs(self:Pets()) do
|
||||
local petActor = instancia.showing[class_type]:PegarCombatente (nil, petName)
|
||||
if (petActor) then
|
||||
for _spellid, _skill in _pairs(petActor:GetActorSpells()) do
|
||||
for _spellid, _skill in pairs(petActor:GetActorSpells()) do
|
||||
if (_skill [skill_key] > 0) then
|
||||
local SkillName, _, SkillIcon = _GetSpellInfo(_spellid)
|
||||
local petName = petName:gsub ((" <.*"), "")
|
||||
@@ -1379,7 +1379,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
|
||||
|
||||
--TOP Curados
|
||||
ActorSkillsContainer = self.targets
|
||||
for target_name, amount in _pairs(ActorSkillsContainer) do
|
||||
for target_name, amount in pairs(ActorSkillsContainer) do
|
||||
if (amount > 0) then
|
||||
|
||||
--translate cyrillic alphabet to western alphabet by Vardex (https://github.com/Vardex May 22, 2019)
|
||||
@@ -1387,7 +1387,7 @@ function atributo_heal:ToolTip_HealingDone (instancia, numero, barra, keydown)
|
||||
target_name = Translit:Transliterate(target_name, "!")
|
||||
end
|
||||
|
||||
_table_insert (ActorHealingTargets, {target_name, amount, amount / ActorTotal * 100})
|
||||
tinsert (ActorHealingTargets, {target_name, amount, amount / ActorTotal * 100})
|
||||
end
|
||||
end
|
||||
_table_sort (ActorHealingTargets, _detalhes.Sort2)
|
||||
@@ -1683,7 +1683,7 @@ function atributo_heal:MontaInfoHealTaken()
|
||||
local meus_curandeiros = {}
|
||||
|
||||
local este_curandeiro
|
||||
for nome, _ in _pairs(curandeiros) do
|
||||
for nome, _ in pairs(curandeiros) do
|
||||
este_curandeiro = showing._ActorTable[showing._NameIndexTable[nome]]
|
||||
if (este_curandeiro) then
|
||||
local alvos = este_curandeiro.targets
|
||||
@@ -1737,9 +1737,9 @@ function atributo_heal:MontaInfoOverHealing()
|
||||
local minhas_curas = {}
|
||||
local barras = info.barras1
|
||||
|
||||
for spellid, tabela in _pairs(tabela) do
|
||||
for spellid, tabela in pairs(tabela) do
|
||||
local nome, _, icone = _GetSpellInfo(spellid)
|
||||
_table_insert (minhas_curas, {spellid, tabela.overheal, tabela.overheal/total*100, nome, icone})
|
||||
tinsert (minhas_curas, {spellid, tabela.overheal, tabela.overheal/total*100, nome, icone})
|
||||
end
|
||||
|
||||
--add pets
|
||||
@@ -1749,9 +1749,9 @@ function atributo_heal:MontaInfoOverHealing()
|
||||
local PetActor = instancia.showing (class_type, PetName)
|
||||
if (PetActor) then
|
||||
local PetSkillsContainer = PetActor.spells._ActorTable
|
||||
for _spellid, _skill in _pairs(PetSkillsContainer) do --da foreach em cada spellid do container
|
||||
for _spellid, _skill in pairs(PetSkillsContainer) do --da foreach em cada spellid do container
|
||||
local nome, _, icone = _GetSpellInfo(_spellid)
|
||||
_table_insert (minhas_curas, {_spellid, _skill.overheal, _skill.overheal/total*100, nome .. " (|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r)", icone, PetActor})
|
||||
tinsert (minhas_curas, {_spellid, _skill.overheal, _skill.overheal/total*100, nome .. " (|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r)", icone, PetActor})
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1818,13 +1818,13 @@ function atributo_heal:MontaInfoOverHealing()
|
||||
local jogadores_overhealed = {}
|
||||
tabela = self.targets_overheal
|
||||
local heal_container = instancia.showing[2]
|
||||
for target_name, amount in _pairs(tabela) do
|
||||
for target_name, amount in pairs(tabela) do
|
||||
local classe = "UNKNOW"
|
||||
local actor_object = heal_container._ActorTable [heal_container._NameIndexTable [tabela.nome]]
|
||||
if (actor_object) then
|
||||
classe = actor_object.classe
|
||||
end
|
||||
_table_insert (jogadores_overhealed, {target_name, amount, amount/total*100, classe})
|
||||
tinsert (jogadores_overhealed, {target_name, amount, amount/total*100, classe})
|
||||
end
|
||||
_table_sort (jogadores_overhealed, _detalhes.Sort2)
|
||||
|
||||
@@ -1886,9 +1886,9 @@ function atributo_heal:MontaInfoHealingDone()
|
||||
meu_tempo = info.instancia.showing:GetCombatTime()
|
||||
end
|
||||
|
||||
for spellid, tabela in _pairs(tabela) do
|
||||
for spellid, tabela in pairs(tabela) do
|
||||
local nome, rank, icone = _GetSpellInfo(spellid)
|
||||
_table_insert (minhas_curas, {
|
||||
tinsert (minhas_curas, {
|
||||
spellid,
|
||||
tabela.total,
|
||||
tabela.total/total*100,
|
||||
@@ -1909,9 +1909,9 @@ function atributo_heal:MontaInfoHealingDone()
|
||||
local PetActor = instancia.showing (class_type, PetName)
|
||||
if (PetActor) then
|
||||
local PetSkillsContainer = PetActor.spells._ActorTable
|
||||
for _spellid, _skill in _pairs(PetSkillsContainer) do --da foreach em cada spellid do container
|
||||
for _spellid, _skill in pairs(PetSkillsContainer) do --da foreach em cada spellid do container
|
||||
local nome, _, icone = _GetSpellInfo(_spellid)
|
||||
_table_insert (minhas_curas, {
|
||||
tinsert (minhas_curas, {
|
||||
_spellid,
|
||||
_skill.total,
|
||||
_skill.total/total*100,
|
||||
@@ -1970,8 +1970,8 @@ function atributo_heal:MontaInfoHealingDone()
|
||||
--TOP CURADOS
|
||||
local healedTargets = {}
|
||||
tabela = self.targets
|
||||
for target_name, amount in _pairs(tabela) do
|
||||
_table_insert (healedTargets, {target_name, amount, amount / total*100})
|
||||
for target_name, amount in pairs(tabela) do
|
||||
tinsert (healedTargets, {target_name, amount, amount / total*100})
|
||||
end
|
||||
_table_sort(healedTargets, _detalhes.Sort2)
|
||||
|
||||
@@ -2045,8 +2045,8 @@ function atributo_heal:MontaTooltipAlvos (thisLine, index, instancia)
|
||||
GameCooltip:SetOption("MinWidth", max(230, thisLine:GetWidth()*0.98))
|
||||
|
||||
--add spells
|
||||
for spellid, tabela in _pairs(container) do
|
||||
for target_name, amount in _pairs(tabela ["targets" .. targets_key]) do
|
||||
for spellid, tabela in pairs(container) do
|
||||
for target_name, amount in pairs(tabela ["targets" .. targets_key]) do
|
||||
if (target_name == inimigo) then
|
||||
local nome, _, icone = _GetSpellInfo(spellid)
|
||||
habilidades [#habilidades+1] = {nome, amount, icone}
|
||||
@@ -2060,9 +2060,9 @@ function atributo_heal:MontaTooltipAlvos (thisLine, index, instancia)
|
||||
local PetActor = instancia.showing (class_type, PetName)
|
||||
if (PetActor) then
|
||||
local PetSkillsContainer = PetActor.spells._ActorTable
|
||||
for _spellid, _skill in _pairs(PetSkillsContainer) do
|
||||
for _spellid, _skill in pairs(PetSkillsContainer) do
|
||||
|
||||
for target_name, amount in _pairs(_skill ["targets" .. targets_key]) do
|
||||
for target_name, amount in pairs(_skill ["targets" .. targets_key]) do
|
||||
if (target_name == inimigo) then
|
||||
local nome, _, icone = _GetSpellInfo(_spellid)
|
||||
habilidades [#habilidades+1] = {nome, amount, icone}
|
||||
@@ -2150,7 +2150,7 @@ function atributo_heal:MontaDetalhesHealingTaken (nome, barra)
|
||||
local showing = tabela_do_combate [class_type] --o que esta sendo mostrado -> [1] - dano [2] - cura --pega o container com ._NameIndexTable ._ActorTable
|
||||
|
||||
local este_curandeiro = showing._ActorTable[showing._NameIndexTable[nome]]
|
||||
local conteudo = este_curandeiro.spells._ActorTable --_pairs[] com os IDs das magias
|
||||
local conteudo = este_curandeiro.spells._ActorTable --pairs[] com os IDs das magias
|
||||
|
||||
local actor = info.jogador.nome
|
||||
|
||||
@@ -2158,10 +2158,10 @@ function atributo_heal:MontaDetalhesHealingTaken (nome, barra)
|
||||
|
||||
local minhas_magias = {}
|
||||
|
||||
for spellid, tabela in _pairs(conteudo) do --da foreach em cada spellid do container
|
||||
for spellid, tabela in pairs(conteudo) do --da foreach em cada spellid do container
|
||||
if (tabela.targets [actor]) then
|
||||
local spell_nome, _, icone = _GetSpellInfo(spellid)
|
||||
_table_insert (minhas_magias, {spellid, tabela.targets [actor], tabela.targets [actor] / total*100, spell_nome, icone})
|
||||
tinsert (minhas_magias, {spellid, tabela.targets [actor], tabela.targets [actor] / total*100, spell_nome, icone})
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2278,7 +2278,7 @@ function atributo_heal:MontaDetalhesHealingDone (spellid, barra)
|
||||
|
||||
if (not spell_cast and misc_actor.spell_cast) then
|
||||
local spellname = GetSpellInfo(spellid)
|
||||
for casted_spellid, amount in _pairs(misc_actor.spell_cast) do
|
||||
for casted_spellid, amount in pairs(misc_actor.spell_cast) do
|
||||
local casted_spellname = GetSpellInfo(casted_spellid)
|
||||
if (casted_spellname == spellname) then
|
||||
spell_cast = amount .. " (|cFFFFFF00?|r)"
|
||||
@@ -2493,33 +2493,33 @@ end
|
||||
_detalhes.refresh:r_atributo_heal (actor, shadow)
|
||||
|
||||
--copia o container de alvos (captura de dados)
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
shadow.targets [target_name] = 0
|
||||
end
|
||||
for target_name, amount in _pairs(actor.targets_overheal) do
|
||||
for target_name, amount in pairs(actor.targets_overheal) do
|
||||
shadow.targets_overheal [target_name] = 0
|
||||
end
|
||||
for target_name, amount in _pairs(actor.targets_absorbs) do
|
||||
for target_name, amount in pairs(actor.targets_absorbs) do
|
||||
shadow.targets_absorbs [target_name] = 0
|
||||
end
|
||||
|
||||
--copia o container de habilidades (captura de dados)
|
||||
for spellid, habilidade in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(actor.spells._ActorTable) do
|
||||
--cria e soma o valor
|
||||
local habilidade_shadow = shadow.spells:PegaHabilidade (spellid, true, nil, true)
|
||||
--refresh e soma os valores dos alvos
|
||||
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
if (not habilidade_shadow.targets [target_name]) then
|
||||
habilidade_shadow.targets [target_name] = 0
|
||||
end
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_overheal) do
|
||||
for target_name, amount in pairs(habilidade.targets_overheal) do
|
||||
if (not habilidade_shadow.targets_overheal [target_name]) then
|
||||
habilidade_shadow.targets_overheal [target_name] = 0
|
||||
end
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_absorbs) do
|
||||
for target_name, amount in pairs(habilidade.targets_absorbs) do
|
||||
if (not habilidade_shadow.targets_absorbs [target_name]) then
|
||||
habilidade_shadow.targets_absorbs [target_name] = 0
|
||||
end
|
||||
@@ -2531,12 +2531,12 @@ end
|
||||
habilidade_shadow.heal_denied = habilidade_shadow.heal_denied or {}
|
||||
habilidade_shadow.heal_denied_healers = habilidade_shadow.heal_denied_healers or {}
|
||||
--copia
|
||||
for spellID, amount in _pairs(habilidade.heal_denied) do
|
||||
for spellID, amount in pairs(habilidade.heal_denied) do
|
||||
if (not habilidade_shadow.heal_denied [spellID]) then
|
||||
habilidade_shadow.heal_denied [spellID] = 0
|
||||
end
|
||||
end
|
||||
for healerName, amount in _pairs(habilidade.heal_denied_healers) do
|
||||
for healerName, amount in pairs(habilidade.heal_denied_healers) do
|
||||
if (not habilidade_shadow.heal_denied_healers [healerName]) then
|
||||
habilidade_shadow.heal_denied_healers [healerName] = 0
|
||||
end
|
||||
@@ -2614,12 +2614,12 @@ end
|
||||
end
|
||||
|
||||
--copia o healing_from (captura de dados)
|
||||
for nome, _ in _pairs(actor.healing_from) do
|
||||
for nome, _ in pairs(actor.healing_from) do
|
||||
shadow.healing_from [nome] = true
|
||||
end
|
||||
|
||||
--copia o heal_enemy (captura de dados)
|
||||
for spellid, amount in _pairs(actor.heal_enemy) do
|
||||
for spellid, amount in pairs(actor.heal_enemy) do
|
||||
if (shadow.heal_enemy [spellid]) then
|
||||
shadow.heal_enemy [spellid] = shadow.heal_enemy [spellid] + amount
|
||||
else
|
||||
@@ -2628,29 +2628,29 @@ end
|
||||
end
|
||||
|
||||
--copia o container de alvos (captura de dados)
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
shadow.targets [target_name] = (shadow.targets [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(actor.targets_overheal) do
|
||||
for target_name, amount in pairs(actor.targets_overheal) do
|
||||
shadow.targets_overheal [target_name] = (shadow.targets_overheal [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(actor.targets_absorbs) do
|
||||
for target_name, amount in pairs(actor.targets_absorbs) do
|
||||
shadow.targets_absorbs [target_name] = (shadow.targets_absorbs [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--copia o container de habilidades (captura de dados)
|
||||
for spellid, habilidade in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(actor.spells._ActorTable) do
|
||||
--cria e soma o valor
|
||||
local habilidade_shadow = shadow.spells:PegaHabilidade (spellid, true, nil, true)
|
||||
|
||||
--refresh e soma os valores dos alvos
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
habilidade_shadow.targets [target_name] = (habilidade_shadow.targets [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_overheal) do
|
||||
for target_name, amount in pairs(habilidade.targets_overheal) do
|
||||
habilidade_shadow.targets_overheal [target_name] = (habilidade_shadow.targets_overheal [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_absorbs) do
|
||||
for target_name, amount in pairs(habilidade.targets_absorbs) do
|
||||
habilidade_shadow.targets_absorbs [target_name] = (habilidade_shadow.targets_absorbs [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
@@ -2660,16 +2660,16 @@ end
|
||||
habilidade_shadow.heal_denied = habilidade_shadow.heal_denied or {}
|
||||
habilidade_shadow.heal_denied_healers = habilidade_shadow.heal_denied_healers or {}
|
||||
--copia
|
||||
for spellID, amount in _pairs(habilidade.heal_denied) do
|
||||
for spellID, amount in pairs(habilidade.heal_denied) do
|
||||
habilidade_shadow.heal_denied [spellID] = (habilidade_shadow.heal_denied [spellID] or 0) + amount
|
||||
end
|
||||
for healerName, amount in _pairs(habilidade.heal_denied_healers) do
|
||||
for healerName, amount in pairs(habilidade.heal_denied_healers) do
|
||||
habilidade_shadow.heal_denied_healers [healerName] = (habilidade_shadow.heal_denied_healers [healerName] or 0) + amount
|
||||
end
|
||||
end
|
||||
|
||||
--soma todos os demais valores
|
||||
for key, value in _pairs(habilidade) do
|
||||
for key, value in pairs(habilidade) do
|
||||
if (type(value) == "number") then
|
||||
if (key ~= "id") then
|
||||
if (not habilidade_shadow [key]) then
|
||||
@@ -2725,12 +2725,12 @@ atributo_heal.__add = function(tabela1, tabela2)
|
||||
tabela1.healing_taken = tabela1.healing_taken + tabela2.healing_taken
|
||||
|
||||
--soma o healing_from
|
||||
for nome, _ in _pairs(tabela2.healing_from) do
|
||||
for nome, _ in pairs(tabela2.healing_from) do
|
||||
tabela1.healing_from [nome] = true
|
||||
end
|
||||
|
||||
--somar o heal_enemy
|
||||
for spellid, amount in _pairs(tabela2.heal_enemy) do
|
||||
for spellid, amount in pairs(tabela2.heal_enemy) do
|
||||
if (tabela1.heal_enemy [spellid]) then
|
||||
tabela1.heal_enemy [spellid] = tabela1.heal_enemy [spellid] + amount
|
||||
else
|
||||
@@ -2739,28 +2739,28 @@ atributo_heal.__add = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--somar o container de alvos
|
||||
for target_name, amount in _pairs(tabela2.targets) do
|
||||
for target_name, amount in pairs(tabela2.targets) do
|
||||
tabela1.targets [target_name] = (tabela1.targets [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(tabela2.targets_overheal) do
|
||||
for target_name, amount in pairs(tabela2.targets_overheal) do
|
||||
tabela1.targets_overheal [target_name] = (tabela1.targets_overheal [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(tabela2.targets_absorbs) do
|
||||
for target_name, amount in pairs(tabela2.targets_absorbs) do
|
||||
tabela1.targets_absorbs [target_name] = (tabela1.targets_absorbs [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--soma o container de habilidades
|
||||
for spellid, habilidade in _pairs(tabela2.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(tabela2.spells._ActorTable) do
|
||||
--pega a habilidade no primeiro ator
|
||||
local habilidade_tabela1 = tabela1.spells:PegaHabilidade (spellid, true, "SPELL_HEAL", false)
|
||||
--soma os alvos
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
habilidade_tabela1.targets = (habilidade_tabela1.targets [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_overheal) do
|
||||
for target_name, amount in pairs(habilidade.targets_overheal) do
|
||||
habilidade_tabela1.targets_overheal = (habilidade_tabela1.targets_overheal [target_name] or 0) + amount
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_absorbs) do
|
||||
for target_name, amount in pairs(habilidade.targets_absorbs) do
|
||||
habilidade_tabela1.targets_absorbs = (habilidade_tabela1.targets_absorbs [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
@@ -2770,16 +2770,16 @@ atributo_heal.__add = function(tabela1, tabela2)
|
||||
habilidade_tabela1.heal_denied = habilidade_tabela1.heal_denied or {}
|
||||
habilidade_tabela1.heal_denied_healers = habilidade_tabela1.heal_denied_healers or {}
|
||||
--copia
|
||||
for spellID, amount in _pairs(habilidade.heal_denied) do
|
||||
for spellID, amount in pairs(habilidade.heal_denied) do
|
||||
habilidade_tabela1.heal_denied [spellID] = (habilidade_tabela1.heal_denied [spellID] or 0) + amount
|
||||
end
|
||||
for healerName, amount in _pairs(habilidade.heal_denied_healers) do
|
||||
for healerName, amount in pairs(habilidade.heal_denied_healers) do
|
||||
habilidade_tabela1.heal_denied_healers [healerName] = (habilidade_tabela1.heal_denied_healers [healerName] or 0) + amount
|
||||
end
|
||||
end
|
||||
|
||||
--soma os valores da habilidade
|
||||
for key, value in _pairs(habilidade) do
|
||||
for key, value in pairs(habilidade) do
|
||||
if (type(value) == "number") then
|
||||
if (key ~= "id") then
|
||||
if (not habilidade_tabela1 [key]) then
|
||||
@@ -2828,7 +2828,7 @@ atributo_heal.__sub = function(tabela1, tabela2)
|
||||
tabela1.healing_taken = tabela1.healing_taken - tabela2.healing_taken
|
||||
|
||||
--reduz o heal_enemy
|
||||
for spellid, amount in _pairs(tabela2.heal_enemy) do
|
||||
for spellid, amount in pairs(tabela2.heal_enemy) do
|
||||
if (tabela1.heal_enemy [spellid]) then
|
||||
tabela1.heal_enemy [spellid] = tabela1.heal_enemy [spellid] - amount
|
||||
else
|
||||
@@ -2837,38 +2837,38 @@ atributo_heal.__sub = function(tabela1, tabela2)
|
||||
end
|
||||
|
||||
--reduz o container de alvos
|
||||
for target_name, amount in _pairs(tabela2.targets) do
|
||||
for target_name, amount in pairs(tabela2.targets) do
|
||||
if (tabela1.targets [target_name]) then
|
||||
tabela1.targets [target_name] = tabela1.targets [target_name] - amount
|
||||
end
|
||||
end
|
||||
for target_name, amount in _pairs(tabela2.targets_overheal) do
|
||||
for target_name, amount in pairs(tabela2.targets_overheal) do
|
||||
if (tabela1.targets_overheal [target_name]) then
|
||||
tabela1.targets_overheal [target_name] = tabela1.targets_overheal [target_name] - amount
|
||||
end
|
||||
end
|
||||
for target_name, amount in _pairs(tabela2.targets_absorbs) do
|
||||
for target_name, amount in pairs(tabela2.targets_absorbs) do
|
||||
if (tabela1.targets_absorbs [target_name]) then
|
||||
tabela1.targets_absorbs [target_name] = tabela1.targets_absorbs [target_name] - amount
|
||||
end
|
||||
end
|
||||
|
||||
--reduz o container de habilidades
|
||||
for spellid, habilidade in _pairs(tabela2.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(tabela2.spells._ActorTable) do
|
||||
--pega a habilidade no primeiro ator
|
||||
local habilidade_tabela1 = tabela1.spells:PegaHabilidade (spellid, true, "SPELL_HEAL", false)
|
||||
--alvos
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
if (habilidade_tabela1.targets [target_name]) then
|
||||
habilidade_tabela1.targets [target_name] = habilidade_tabela1.targets [target_name] - amount
|
||||
end
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_overheal) do
|
||||
for target_name, amount in pairs(habilidade.targets_overheal) do
|
||||
if (habilidade_tabela1.targets_overheal [target_name]) then
|
||||
habilidade_tabela1.targets_overheal [target_name] = habilidade_tabela1.targets_overheal [target_name] - amount
|
||||
end
|
||||
end
|
||||
for target_name, amount in _pairs(habilidade.targets_absorbs) do
|
||||
for target_name, amount in pairs(habilidade.targets_absorbs) do
|
||||
if (habilidade_tabela1.targets_absorbs [target_name]) then
|
||||
habilidade_tabela1.targets_absorbs [target_name] = habilidade_tabela1.targets_absorbs [target_name] - amount
|
||||
end
|
||||
@@ -2880,16 +2880,16 @@ atributo_heal.__sub = function(tabela1, tabela2)
|
||||
habilidade_tabela1.heal_denied = habilidade_tabela1.heal_denied or {}
|
||||
habilidade_tabela1.heal_denied_healers = habilidade_tabela1.heal_denied_healers or {}
|
||||
--copia
|
||||
for spellID, amount in _pairs(habilidade.heal_denied) do
|
||||
for spellID, amount in pairs(habilidade.heal_denied) do
|
||||
habilidade_tabela1.heal_denied [spellID] = (habilidade_tabela1.heal_denied [spellID] or 0) - amount
|
||||
end
|
||||
for healerName, amount in _pairs(habilidade.heal_denied_healers) do
|
||||
for healerName, amount in pairs(habilidade.heal_denied_healers) do
|
||||
habilidade_tabela1.heal_denied_healers [healerName] = (habilidade_tabela1.heal_denied_healers [healerName] or 0) - amount
|
||||
end
|
||||
end
|
||||
|
||||
--soma os valores da habilidade
|
||||
for key, value in _pairs(habilidade) do
|
||||
for key, value in pairs(habilidade) do
|
||||
if (type(value) == "number") then
|
||||
if (key ~= "id") then
|
||||
if (not habilidade_tabela1 [key]) then
|
||||
|
||||
+10
-10
@@ -4,7 +4,7 @@ local SharedMedia = LibStub:GetLibrary("LibSharedMedia-3.0")
|
||||
|
||||
local type= type --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local abs = math.abs --lua local
|
||||
local _table_remove = table.remove --lua local
|
||||
@@ -755,7 +755,7 @@ end
|
||||
--break snaps of previous and next window
|
||||
local left_instance = _detalhes:GetInstance(id-1)
|
||||
if (left_instance) then
|
||||
for snap_side, instance_id in _pairs(left_instance.snap) do
|
||||
for snap_side, instance_id in pairs(left_instance.snap) do
|
||||
if (instance_id == id) then --snap na proxima instancia
|
||||
left_instance.snap [snap_side] = nil
|
||||
end
|
||||
@@ -763,7 +763,7 @@ end
|
||||
end
|
||||
local right_instance = _detalhes:GetInstance(id+1)
|
||||
if (right_instance) then
|
||||
for snap_side, instance_id in _pairs(right_instance.snap) do
|
||||
for snap_side, instance_id in pairs(right_instance.snap) do
|
||||
if (instance_id == id) then --snap na proxima instancia
|
||||
right_instance.snap [snap_side] = nil
|
||||
end
|
||||
@@ -774,7 +774,7 @@ end
|
||||
for i = id+1, #_detalhes.tabela_instancias do
|
||||
local this_instance = _detalhes:GetInstance(i)
|
||||
--fix the snaps
|
||||
for snap_side, instance_id in _pairs(this_instance.snap) do
|
||||
for snap_side, instance_id in pairs(this_instance.snap) do
|
||||
if (instance_id == i+1) then --snap na proxima instancia
|
||||
this_instance.snap [snap_side] = i
|
||||
elseif (instance_id == i-1 and i-2 > 0) then --snap na instancia anterior
|
||||
@@ -944,7 +944,7 @@ function _detalhes:BaseFrameSnap()
|
||||
end
|
||||
|
||||
local my_baseframe = self.baseframe
|
||||
for lado, snap_to in _pairs(self.snap) do
|
||||
for lado, snap_to in pairs(self.snap) do
|
||||
local instancia_alvo = _detalhes.tabela_instancias [snap_to]
|
||||
|
||||
if (instancia_alvo) then
|
||||
@@ -982,7 +982,7 @@ function _detalhes:BaseFrameSnap()
|
||||
local inicio_retro = self.meu_id - 1
|
||||
for meu_id = inicio_retro, 1, -1 do
|
||||
local instancia = _detalhes.tabela_instancias [meu_id]
|
||||
for lado, snap_to in _pairs(instancia.snap) do
|
||||
for lado, snap_to in pairs(instancia.snap) do
|
||||
if (snap_to < instancia.meu_id and snap_to ~= self.meu_id) then --se o lado que esta grudado for menor que o meu id... EX instnacia #2 grudada na #1
|
||||
|
||||
--ent�o tenho que pegar a inst�ncia do snap
|
||||
@@ -1036,7 +1036,7 @@ function _detalhes:BaseFrameSnap()
|
||||
|
||||
for meu_id, instancia in ipairs(_detalhes.tabela_instancias) do
|
||||
if (meu_id > self.meu_id) then
|
||||
for lado, snap_to in _pairs(instancia.snap) do
|
||||
for lado, snap_to in pairs(instancia.snap) do
|
||||
if (snap_to > instancia.meu_id and snap_to ~= self.meu_id) then
|
||||
local instancia_alvo = _detalhes.tabela_instancias [snap_to]
|
||||
|
||||
@@ -1075,7 +1075,7 @@ function _detalhes:agrupar_janelas(lados)
|
||||
|
||||
local instancia = self
|
||||
|
||||
for lado, esta_instancia in _pairs(lados) do
|
||||
for lado, esta_instancia in pairs(lados) do
|
||||
if (esta_instancia) then
|
||||
instancia.baseframe:ClearAllPoints()
|
||||
esta_instancia = _detalhes.tabela_instancias [esta_instancia]
|
||||
@@ -1206,7 +1206,7 @@ function _detalhes:Desagrupar (instancia, lado, lado2)
|
||||
local ID = instancia.meu_id
|
||||
|
||||
for id, esta_instancia in ipairs(_detalhes.tabela_instancias) do
|
||||
for index, iid in _pairs(esta_instancia.snap) do -- index = 1 left , 3 right, 2 bottom, 4 top
|
||||
for index, iid in pairs(esta_instancia.snap) do -- index = 1 left , 3 right, 2 bottom, 4 top
|
||||
if (iid and (iid == ID or id == ID)) then -- iid = instancia.meu_id
|
||||
|
||||
esta_instancia.snap [index] = nil
|
||||
@@ -3005,7 +3005,7 @@ function _detalhes:FormatReportLines (report_table, data, f1, f2, f3)
|
||||
f3 = f3 or default_format_value3
|
||||
|
||||
if (not _detalhes.fontstring_len) then
|
||||
_detalhes.fontstring_len = _detalhes.listener:CreateFontString (nil, "background", "GameFontNormal")
|
||||
_detalhes.fontstring_len = _detalhes.listener:CreateFontString(nil, "background", "GameFontNormal")
|
||||
end
|
||||
local _, fontSize = FCF_GetChatWindowInfo (1)
|
||||
if (fontSize < 1) then
|
||||
|
||||
+22
-22
@@ -3,10 +3,10 @@
|
||||
local _cstr = string.format
|
||||
local _math_floor = math.floor
|
||||
local _table_sort = table.sort
|
||||
local _table_insert = table.insert
|
||||
local tinsert = table.insert
|
||||
local _setmetatable = setmetatable
|
||||
local ipairs = ipairs
|
||||
local _pairs = pairs
|
||||
local pairs = pairs
|
||||
local _rawget= rawget
|
||||
local _math_min = math.min
|
||||
local _math_max = math.max
|
||||
@@ -16,8 +16,8 @@ local type = type
|
||||
--api locals
|
||||
local _GetSpellInfo = _detalhes.getspellinfo
|
||||
local GameTooltip = GameTooltip
|
||||
local _IsInRaid = IsInRaid
|
||||
local _IsInGroup = IsInGroup
|
||||
local IsInRaid = IsInRaid
|
||||
local IsInGroup = IsInGroup
|
||||
|
||||
local _string_replace = _detalhes.string.replace --details api
|
||||
|
||||
@@ -507,7 +507,7 @@ function atributo_energy:RefreshWindow (instancia, tabela_do_combate, forcar, ex
|
||||
if (instancia.total_bar.enabled) then
|
||||
use_total_bar = true
|
||||
|
||||
if (instancia.total_bar.only_in_group and (not _IsInGroup() and not _IsInRaid())) then
|
||||
if (instancia.total_bar.only_in_group and (not IsInGroup() and not IsInRaid())) then
|
||||
use_total_bar = false
|
||||
end
|
||||
end
|
||||
@@ -839,7 +839,7 @@ local reset_tooltips_table = function()
|
||||
t[1], t[2], t[3] = "", 0, ""
|
||||
end
|
||||
|
||||
for k, v in _pairs(energy_tooltips_hash) do
|
||||
for k, v in pairs(energy_tooltips_hash) do
|
||||
energy_tooltips_hash [k] = nil
|
||||
end
|
||||
end
|
||||
@@ -867,7 +867,7 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown
|
||||
for index, actor in ipairs(container._ActorTable) do
|
||||
if (actor.powertype == powertype) then
|
||||
|
||||
for spellid, spell in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, spell in pairs(actor.spells._ActorTable) do
|
||||
local on_self = spell.targets [name]
|
||||
if (on_self) then
|
||||
local already_tracked = energy_tooltips_hash [spellid]
|
||||
@@ -1001,7 +1001,7 @@ function atributo_energy:ToolTipRegenRecebido (instancia, numero, barra, keydown
|
||||
--player generators
|
||||
local allGeneratorSpells = {}
|
||||
local allGenerated = 0
|
||||
for spellid, spellObject in _pairs(self.spells._ActorTable) do
|
||||
for spellid, spellObject in pairs(self.spells._ActorTable) do
|
||||
tinsert(allGeneratorSpells, {spellObject, spellObject.total, spellObject.totalover})
|
||||
allGenerated = allGenerated + spellObject.total
|
||||
end
|
||||
@@ -1069,7 +1069,7 @@ function atributo_energy:MontaInfoRegenRecebido()
|
||||
for index, actor in ipairs(container._ActorTable) do
|
||||
if (actor.powertype == powertype) then
|
||||
|
||||
for spellid, spell in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, spell in pairs(actor.spells._ActorTable) do
|
||||
local on_self = spell.targets [my_name]
|
||||
|
||||
if (on_self) then
|
||||
@@ -1320,7 +1320,7 @@ function atributo_energy:MontaTooltipAlvos (esta_barra, index)
|
||||
--spells:
|
||||
local i = 1
|
||||
|
||||
for spellid, spell in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, spell in pairs(actor.spells._ActorTable) do
|
||||
local on_self = spell.targets [my_name]
|
||||
if (on_self) then
|
||||
local t = energy_tooltips_table [i]
|
||||
@@ -1423,15 +1423,15 @@ end
|
||||
end
|
||||
|
||||
--targets
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
shadow.targets [target_name] = 0
|
||||
end
|
||||
|
||||
--spells
|
||||
for spellid, habilidade in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(actor.spells._ActorTable) do
|
||||
local habilidade_shadow = shadow.spells:PegaHabilidade (spellid, true, "SPELL_ENERGY", false)
|
||||
--spell targets
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
habilidade_shadow.targets [target_name] = 0
|
||||
end
|
||||
end
|
||||
@@ -1496,12 +1496,12 @@ end
|
||||
end
|
||||
|
||||
--targets
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
shadow.targets [target_name] = (shadow.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--spells
|
||||
for spellid, habilidade in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(actor.spells._ActorTable) do
|
||||
|
||||
local habilidade_shadow = shadow.spells:PegaHabilidade (spellid, true, "SPELL_ENERGY", false)
|
||||
|
||||
@@ -1509,7 +1509,7 @@ end
|
||||
habilidade_shadow.counter = habilidade_shadow.counter + habilidade.counter
|
||||
|
||||
--spell targets
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
habilidade_shadow.targets [target_name] = (habilidade_shadow.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
@@ -1558,12 +1558,12 @@ atributo_energy.__add = function(tabela1, tabela2)
|
||||
tabela1.alternatepower = tabela1.alternatepower + tabela2.alternatepower
|
||||
|
||||
--targets
|
||||
for target_name, amount in _pairs(tabela2.targets) do
|
||||
for target_name, amount in pairs(tabela2.targets) do
|
||||
tabela1.targets [target_name] = (tabela1.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
--spells
|
||||
for spellid, habilidade in _pairs(tabela2.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(tabela2.spells._ActorTable) do
|
||||
|
||||
local habilidade_tabela1 = tabela1.spells:PegaHabilidade (spellid, true, "SPELL_ENERGY", false)
|
||||
|
||||
@@ -1571,7 +1571,7 @@ atributo_energy.__add = function(tabela1, tabela2)
|
||||
habilidade_tabela1.counter = habilidade_tabela1.counter + habilidade.counter
|
||||
|
||||
--spell targets
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
habilidade_tabela1.targets [target_name] = (habilidade_tabela1.targets [target_name] or 0) + amount
|
||||
end
|
||||
|
||||
@@ -1596,14 +1596,14 @@ atributo_energy.__sub = function(tabela1, tabela2)
|
||||
tabela1.alternatepower = tabela1.alternatepower - tabela2.alternatepower
|
||||
|
||||
--targets
|
||||
for target_name, amount in _pairs(tabela2.targets) do
|
||||
for target_name, amount in pairs(tabela2.targets) do
|
||||
if (tabela1.targets [target_name]) then
|
||||
tabela1.targets [target_name] = tabela1.targets [target_name] - amount
|
||||
end
|
||||
end
|
||||
|
||||
--spells
|
||||
for spellid, habilidade in _pairs(tabela2.spells._ActorTable) do
|
||||
for spellid, habilidade in pairs(tabela2.spells._ActorTable) do
|
||||
|
||||
local habilidade_tabela1 = tabela1.spells:PegaHabilidade (spellid, true, "SPELL_ENERGY", false)
|
||||
|
||||
@@ -1611,7 +1611,7 @@ atributo_energy.__sub = function(tabela1, tabela2)
|
||||
habilidade_tabela1.counter = habilidade_tabela1.counter - habilidade.counter
|
||||
|
||||
--spell targets
|
||||
for target_name, amount in _pairs(habilidade.targets) do
|
||||
for target_name, amount in pairs(habilidade.targets) do
|
||||
if (habilidade_tabela1.targets [target_name]) then
|
||||
habilidade_tabela1.targets [target_name] = habilidade_tabela1.targets [target_name] - amount
|
||||
end
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--local pointers
|
||||
local ipairs = ipairs--lua local
|
||||
local _pairs = pairs--lua local
|
||||
local pairs = pairs--lua local
|
||||
local _UnitAura = UnitAura--api local
|
||||
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -168,7 +168,7 @@
|
||||
|
||||
else
|
||||
|
||||
for BuffName, _ in _pairs(_detalhes.Buffs.BuffsTable) do
|
||||
for BuffName, _ in pairs(_detalhes.Buffs.BuffsTable) do
|
||||
local name = _UnitAura ("player", BuffName)
|
||||
if (name ~= nil) then
|
||||
local buff_info = SpellBuffDetails [name] or {["counter"] = 0, ["total"] = 0, ["critico"] = 0, ["critico_dano"] = 0}
|
||||
|
||||
+28
-28
@@ -1,7 +1,7 @@
|
||||
--lua locals
|
||||
local _cstr = string.format
|
||||
local _math_floor = math.floor
|
||||
local _table_insert = table.insert
|
||||
local tinsert = table.insert
|
||||
local _table_size = table.getn
|
||||
local ipairs = ipairs
|
||||
local pairs = pairs
|
||||
@@ -15,12 +15,12 @@ local type = type
|
||||
--api locals
|
||||
local _GetSpellInfo = _detalhes.getspellinfo
|
||||
local GameTooltip = GameTooltip
|
||||
local _IsInRaid = IsInRaid
|
||||
local _IsInGroup = IsInGroup
|
||||
local _GetNumGroupMembers = GetNumGroupMembers
|
||||
local IsInRaid = IsInRaid
|
||||
local IsInGroup = IsInGroup
|
||||
local GetNumGroupMembers = GetNumGroupMembers
|
||||
local _GetNumSubgroupMembers = GetNumSubgroupMembers
|
||||
local _UnitAura = UnitAura
|
||||
local _UnitGUID = UnitGUID
|
||||
local UnitGUID = UnitGUID
|
||||
local _UnitName = UnitName
|
||||
local format = _G.format
|
||||
|
||||
@@ -406,7 +406,7 @@ function atributo_misc:ReportSingleDeadLine (morte, instancia)
|
||||
|
||||
do
|
||||
if (not _detalhes.fontstring_len) then
|
||||
_detalhes.fontstring_len = _detalhes.listener:CreateFontString (nil, "background", "GameFontNormal")
|
||||
_detalhes.fontstring_len = _detalhes.listener:CreateFontString(nil, "background", "GameFontNormal")
|
||||
end
|
||||
local _, fontSize = FCF_GetChatWindowInfo (1)
|
||||
if (fontSize < 1) then
|
||||
@@ -1328,14 +1328,14 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
|
||||
local cacheGetTime = GetTime()
|
||||
|
||||
if (_IsInRaid()) then
|
||||
if (IsInRaid()) then
|
||||
|
||||
local checked = {}
|
||||
|
||||
for raidIndex = 1, _GetNumGroupMembers() do
|
||||
for raidIndex = 1, GetNumGroupMembers() do
|
||||
|
||||
local target = "raid"..raidIndex.."target"
|
||||
local his_target = _UnitGUID(target)
|
||||
local his_target = UnitGUID(target)
|
||||
|
||||
if (his_target and not checked [his_target]) then
|
||||
local rect = UnitReaction (target, "player")
|
||||
@@ -1346,7 +1346,7 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
for debuffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff (target, debuffIndex)
|
||||
if (name and unitCaster) then
|
||||
local playerGUID = _UnitGUID(unitCaster)
|
||||
local playerGUID = UnitGUID(unitCaster)
|
||||
if (playerGUID) then
|
||||
|
||||
local playerName, realmName = _UnitName (unitCaster)
|
||||
@@ -1362,12 +1362,12 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
end
|
||||
end
|
||||
|
||||
elseif (_IsInGroup()) then
|
||||
elseif (IsInGroup()) then
|
||||
|
||||
local checked = {}
|
||||
|
||||
for raidIndex = 1, _GetNumGroupMembers()-1 do
|
||||
local his_target = _UnitGUID("party"..raidIndex.."target")
|
||||
for raidIndex = 1, GetNumGroupMembers()-1 do
|
||||
local his_target = UnitGUID("party"..raidIndex.."target")
|
||||
local rect = UnitReaction ("party"..raidIndex.."target", "player")
|
||||
if (his_target and not checked [his_target] and rect and rect <= 4) then
|
||||
|
||||
@@ -1377,7 +1377,7 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("party"..raidIndex.."target", debuffIndex)
|
||||
if (name and unitCaster) then
|
||||
local playerName, realmName = _UnitName (unitCaster)
|
||||
local playerGUID = _UnitGUID(unitCaster)
|
||||
local playerGUID = UnitGUID(unitCaster)
|
||||
if (playerGUID) then
|
||||
if (realmName and realmName ~= "") then
|
||||
playerName = playerName .. "-" .. realmName
|
||||
@@ -1390,14 +1390,14 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
end
|
||||
end
|
||||
|
||||
local his_target = _UnitGUID("playertarget")
|
||||
local his_target = UnitGUID("playertarget")
|
||||
local rect = UnitReaction ("playertarget", "player")
|
||||
if (his_target and not checked [his_target] and rect and rect <= 4) then
|
||||
for debuffIndex = 1, 40 do
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
if (name and unitCaster) then
|
||||
local playerName, realmName = _UnitName (unitCaster)
|
||||
local playerGUID = _UnitGUID(unitCaster)
|
||||
local playerGUID = UnitGUID(unitCaster)
|
||||
if (playerGUID) then
|
||||
if (realmName and realmName ~= "") then
|
||||
playerName = playerName .. "-" .. realmName
|
||||
@@ -1409,7 +1409,7 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
end
|
||||
|
||||
else
|
||||
local his_target = _UnitGUID("playertarget")
|
||||
local his_target = UnitGUID("playertarget")
|
||||
if (his_target) then
|
||||
local reaction = UnitReaction ("playertarget", "player")
|
||||
if (reaction and reaction <= 4) then
|
||||
@@ -1417,7 +1417,7 @@ function _detalhes:CatchRaidDebuffUptime (in_or_out) -- "DEBUFF_UPTIME_IN"
|
||||
local name, _, _, _, _, _, _, unitCaster, _, _, spellid = UnitDebuff ("playertarget", debuffIndex)
|
||||
if (name and unitCaster) then
|
||||
local playerName, realmName = _UnitName (unitCaster)
|
||||
local playerGUID = _UnitGUID(unitCaster)
|
||||
local playerGUID = UnitGUID(unitCaster)
|
||||
if (playerGUID) then
|
||||
if (realmName and realmName ~= "") then
|
||||
playerName = playerName .. "-" .. realmName
|
||||
@@ -1441,7 +1441,7 @@ local runes_id = {
|
||||
--called from control on leave / enter combat
|
||||
function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
|
||||
if (_IsInRaid()) then
|
||||
if (IsInRaid()) then
|
||||
|
||||
local pot_usage = {}
|
||||
local focus_augmentation = {}
|
||||
@@ -1449,9 +1449,9 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
--raid groups
|
||||
local cacheGetTime = GetTime()
|
||||
|
||||
for raidIndex = 1, _GetNumGroupMembers() do
|
||||
for raidIndex = 1, GetNumGroupMembers() do
|
||||
local RaidIndex = "raid" .. raidIndex
|
||||
local playerGUID = _UnitGUID(RaidIndex)
|
||||
local playerGUID = UnitGUID(RaidIndex)
|
||||
|
||||
if (playerGUID) then
|
||||
|
||||
@@ -1496,19 +1496,19 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
_detalhes:SendEvent("COMBAT_PREPOTION_UPDATED", nil, pot_usage, focus_augmentation)
|
||||
end
|
||||
|
||||
elseif (_IsInGroup()) then
|
||||
elseif (IsInGroup()) then
|
||||
|
||||
local pot_usage = {}
|
||||
local focus_augmentation = {}
|
||||
|
||||
--party members
|
||||
for groupIndex = 1, _GetNumGroupMembers() - 1 do
|
||||
for groupIndex = 1, GetNumGroupMembers() - 1 do
|
||||
for buffIndex = 1, 41 do
|
||||
local name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("party"..groupIndex, buffIndex, nil, "HELPFUL")
|
||||
if (name and unitCaster and UnitExists (unitCaster) and UnitExists ("party" .. groupIndex) and UnitIsUnit (unitCaster, "party" .. groupIndex)) then
|
||||
|
||||
local playerName, realmName = _UnitName ("party"..groupIndex)
|
||||
local playerGUID = _UnitGUID("party"..groupIndex)
|
||||
local playerGUID = UnitGUID("party"..groupIndex)
|
||||
|
||||
if (playerGUID) then
|
||||
if (realmName and realmName ~= "") then
|
||||
@@ -1535,7 +1535,7 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
local name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
if (name and unitCaster and UnitExists (unitCaster) and UnitIsUnit (unitCaster, "player")) then
|
||||
local playerName = _UnitName ("player")
|
||||
local playerGUID = _UnitGUID("player")
|
||||
local playerGUID = UnitGUID("player")
|
||||
if (playerGUID) then
|
||||
if (in_or_out == "BUFF_UPTIME_IN") then
|
||||
if (_detalhes.PotionList [spellid]) then
|
||||
@@ -1576,7 +1576,7 @@ function _detalhes:CatchRaidBuffUptime (in_or_out)
|
||||
local name, _, _, _, _, _, unitCaster, _, _, spellid = _UnitAura ("player", buffIndex, nil, "HELPFUL")
|
||||
if (name and unitCaster and UnitExists (unitCaster) and UnitIsUnit (unitCaster, "player")) then
|
||||
local playerName = _UnitName ("player")
|
||||
local playerGUID = _UnitGUID("player")
|
||||
local playerGUID = UnitGUID("player")
|
||||
|
||||
if (playerGUID) then
|
||||
if (in_or_out == "BUFF_UPTIME_IN") then
|
||||
@@ -2048,7 +2048,7 @@ function atributo_misc:MontaInfoInterrupt()
|
||||
--player
|
||||
for _spellid, _tabela in pairs(minha_tabela) do --da foreach em cada spellid do container
|
||||
local nome, _, icone = _GetSpellInfo(_spellid)
|
||||
_table_insert (meus_interrupts, {_spellid, _tabela.counter, _tabela.counter/meu_total*100, nome, icone})
|
||||
tinsert (meus_interrupts, {_spellid, _tabela.counter, _tabela.counter/meu_total*100, nome, icone})
|
||||
end
|
||||
--pet
|
||||
local ActorPets = self.pets
|
||||
@@ -2059,7 +2059,7 @@ function atributo_misc:MontaInfoInterrupt()
|
||||
local PetSkillsContainer = PetActor.interrupt_spells._ActorTable
|
||||
for _spellid, _skill in pairs(PetSkillsContainer) do --da foreach em cada spellid do container
|
||||
local nome, _, icone = _GetSpellInfo(_spellid)
|
||||
_table_insert (meus_interrupts, {_spellid, _skill.counter, _skill.counter/meu_total*100, nome .. " (|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r)", icone, PetActor})
|
||||
tinsert (meus_interrupts, {_spellid, _skill.counter, _skill.counter/meu_total*100, nome .. " (|c" .. class_color .. PetName:gsub ((" <.*"), "") .. "|r)", icone, PetActor})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
local _UnitClass = UnitClass --api local
|
||||
local _IsInInstance = IsInInstance --api local
|
||||
local _UnitGUID = UnitGUID --api local
|
||||
local UnitGUID = UnitGUID --api local
|
||||
local strsplit = strsplit --api local
|
||||
|
||||
local _setmetatable = setmetatable --lua local
|
||||
@@ -20,7 +20,7 @@
|
||||
local _bit_band = bit.band --lua local
|
||||
local _table_sort = table.sort --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
|
||||
local AddUnique = DetailsFramework.table.addunique --framework
|
||||
local UnitGroupRolesAssigned = DetailsFramework.UnitGroupRolesAssigned --framework
|
||||
@@ -437,7 +437,7 @@
|
||||
local follower_text_object = _G ["DetailsPetOwnerFinderTextLeft3"] --not in use
|
||||
|
||||
local find_pet_found_owner = function(ownerName, serial, nome, flag, self)
|
||||
local ownerGuid = _UnitGUID(ownerName)
|
||||
local ownerGuid = UnitGUID(ownerName)
|
||||
if (ownerGuid) then
|
||||
_detalhes.tabela_pets:Adicionar (serial, nome, flag, ownerGuid, ownerName, 0x00000417)
|
||||
local nome_dele, dono_nome, dono_serial, dono_flag = _detalhes.tabela_pets:PegaDono (serial, nome, flag)
|
||||
@@ -483,7 +483,7 @@
|
||||
local text1 = line1 and line1:GetText()
|
||||
if (text1 and text1 ~= "") then
|
||||
--for _, playerName in ipairs(Details.tabela_vigente.raid_roster_indexed) do
|
||||
for playerName, _ in _pairs(_detalhes.tabela_vigente.raid_roster) do
|
||||
for playerName, _ in pairs(_detalhes.tabela_vigente.raid_roster) do
|
||||
local pName = playerName
|
||||
playerName = playerName:gsub ("%-.*", "") --remove realm name
|
||||
|
||||
@@ -510,7 +510,7 @@
|
||||
local line2 = _G ["DetailsPetOwnerFinderTextLeft3"]
|
||||
local text2 = line2 and line2:GetText()
|
||||
if (text2 and text2 ~= "") then
|
||||
for playerName, _ in _pairs(_detalhes.tabela_vigente.raid_roster) do
|
||||
for playerName, _ in pairs(_detalhes.tabela_vigente.raid_roster) do
|
||||
--for _, playerName in ipairs(Details.tabela_vigente.raid_roster_indexed) do
|
||||
local pName = playerName
|
||||
playerName = playerName:gsub ("%-.*", "") --remove realm name
|
||||
|
||||
+33
-33
@@ -3,19 +3,19 @@ local gump = _detalhes.gump
|
||||
local container_pets = _detalhes.container_pets
|
||||
|
||||
-- api locals
|
||||
local _UnitGUID = _G.UnitGUID
|
||||
local UnitGUID = _G.UnitGUID
|
||||
local _UnitName = _G.UnitName
|
||||
local _GetUnitName = _G.GetUnitName
|
||||
local _IsInRaid = _G.IsInRaid
|
||||
local _IsInGroup = _G.IsInGroup
|
||||
local _GetNumGroupMembers = _G.GetNumGroupMembers
|
||||
local IsInRaid = _G.IsInRaid
|
||||
local IsInGroup = _G.IsInGroup
|
||||
local GetNumGroupMembers = _G.GetNumGroupMembers
|
||||
|
||||
-- lua locals
|
||||
local _setmetatable = setmetatable
|
||||
local _bit_band = bit.band --lua local
|
||||
local _pairs = pairs
|
||||
local pairs = pairs
|
||||
local ipairs = ipairs
|
||||
local _table_wipe = table.wipe
|
||||
local wipe = table.wipe
|
||||
|
||||
--details locals
|
||||
local is_ignored = _detalhes.pets_ignored
|
||||
@@ -59,10 +59,10 @@ function container_pets:PegaDono (pet_serial, pet_nome, pet_flags)
|
||||
--buscar pelo pet na raide
|
||||
local dono_nome, dono_serial, dono_flags
|
||||
|
||||
if (_IsInRaid()) then
|
||||
for i = 1, _GetNumGroupMembers() do
|
||||
if (pet_serial == _UnitGUID("raidpet"..i)) then
|
||||
dono_serial = _UnitGUID("raid"..i)
|
||||
if (IsInRaid()) then
|
||||
for i = 1, GetNumGroupMembers() do
|
||||
if (pet_serial == UnitGUID("raidpet"..i)) then
|
||||
dono_serial = UnitGUID("raid"..i)
|
||||
dono_flags = 0x00000417 --emulate sourceflag flag
|
||||
|
||||
local nome, realm = _UnitName ("raid"..i)
|
||||
@@ -73,10 +73,10 @@ function container_pets:PegaDono (pet_serial, pet_nome, pet_flags)
|
||||
end
|
||||
end
|
||||
|
||||
elseif (_IsInGroup()) then
|
||||
for i = 1, _GetNumGroupMembers()-1 do
|
||||
if (pet_serial == _UnitGUID("partypet"..i)) then
|
||||
dono_serial = _UnitGUID("party"..i)
|
||||
elseif (IsInGroup()) then
|
||||
for i = 1, GetNumGroupMembers()-1 do
|
||||
if (pet_serial == UnitGUID("partypet"..i)) then
|
||||
dono_serial = UnitGUID("party"..i)
|
||||
dono_flags = 0x00000417 --emulate sourceflag flag
|
||||
|
||||
local nome, realm = _UnitName ("party"..i)
|
||||
@@ -90,10 +90,10 @@ function container_pets:PegaDono (pet_serial, pet_nome, pet_flags)
|
||||
end
|
||||
|
||||
if (not dono_nome) then
|
||||
if (pet_serial == _UnitGUID("pet")) then
|
||||
if (pet_serial == UnitGUID("pet")) then
|
||||
dono_nome = _GetUnitName ("player")
|
||||
dono_serial = _UnitGUID("player")
|
||||
if (_IsInGroup() or _IsInRaid()) then
|
||||
dono_serial = UnitGUID("player")
|
||||
if (IsInGroup() or IsInRaid()) then
|
||||
dono_flags = 0x00000417 --emulate sourceflag flag
|
||||
else
|
||||
dono_flags = 0x00000411 --emulate sourceflag flag
|
||||
@@ -126,7 +126,7 @@ end
|
||||
function container_pets:Unpet (...)
|
||||
local unitid = ...
|
||||
|
||||
local owner_serial = _UnitGUID(unitid)
|
||||
local owner_serial = UnitGUID(unitid)
|
||||
|
||||
if (owner_serial) then
|
||||
--tira o pet existente da tabela de pets e do cache do core
|
||||
@@ -137,7 +137,7 @@ function container_pets:Unpet (...)
|
||||
_detalhes.pets_players [owner_serial] = nil
|
||||
end
|
||||
--verifica se h� um pet novo deste jogador
|
||||
local pet_serial = _UnitGUID(unitid .. "pet")
|
||||
local pet_serial = UnitGUID(unitid .. "pet")
|
||||
if (pet_serial) then
|
||||
if (not _detalhes.tabela_pets.pets [pet_serial]) then
|
||||
local nome, realm = _UnitName (unitid)
|
||||
@@ -157,16 +157,16 @@ function container_pets:PlayerPet (player_serial, pet_serial)
|
||||
end
|
||||
|
||||
function container_pets:BuscarPets()
|
||||
if (_IsInRaid()) then
|
||||
for i = 1, _GetNumGroupMembers(), 1 do
|
||||
local pet_serial = _UnitGUID("raidpet"..i)
|
||||
if (IsInRaid()) then
|
||||
for i = 1, GetNumGroupMembers(), 1 do
|
||||
local pet_serial = UnitGUID("raidpet"..i)
|
||||
if (pet_serial) then
|
||||
if (not _detalhes.tabela_pets.pets [pet_serial]) then
|
||||
local nome, realm = _UnitName ("raid"..i)
|
||||
if (realm and realm ~= "") then
|
||||
nome = nome.."-"..realm
|
||||
end
|
||||
local owner_serial = _UnitGUID("raid"..i)
|
||||
local owner_serial = UnitGUID("raid"..i)
|
||||
_detalhes.tabela_pets:Adicionar (pet_serial, _UnitName ("raidpet"..i), 0x1114, owner_serial, nome, 0x514)
|
||||
_detalhes.parser:RevomeActorFromCache (pet_serial)
|
||||
container_pets:PlayerPet (owner_serial, pet_serial)
|
||||
@@ -174,9 +174,9 @@ function container_pets:BuscarPets()
|
||||
end
|
||||
end
|
||||
|
||||
elseif (_IsInGroup()) then
|
||||
for i = 1, _GetNumGroupMembers()-1, 1 do
|
||||
local pet_serial = _UnitGUID("partypet"..i)
|
||||
elseif (IsInGroup()) then
|
||||
for i = 1, GetNumGroupMembers()-1, 1 do
|
||||
local pet_serial = UnitGUID("partypet"..i)
|
||||
if (pet_serial) then
|
||||
if (not _detalhes.tabela_pets.pets [pet_serial]) then
|
||||
local nome, realm = _UnitName ("party"..i)
|
||||
@@ -184,24 +184,24 @@ function container_pets:BuscarPets()
|
||||
if (realm and realm ~= "") then
|
||||
nome = nome.."-"..realm
|
||||
end
|
||||
_detalhes.tabela_pets:Adicionar (pet_serial, _UnitName ("partypet"..i), 0x1114, _UnitGUID("party"..i), nome, 0x514)
|
||||
_detalhes.tabela_pets:Adicionar (pet_serial, _UnitName ("partypet"..i), 0x1114, UnitGUID("party"..i), nome, 0x514)
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local pet_serial = _UnitGUID("pet")
|
||||
local pet_serial = UnitGUID("pet")
|
||||
if (pet_serial) then
|
||||
if (not _detalhes.tabela_pets.pets [pet_serial]) then
|
||||
_detalhes.tabela_pets:Adicionar (pet_serial, _UnitName ("pet"), 0x1114, _UnitGUID("player"), _detalhes.playername, 0x514)
|
||||
_detalhes.tabela_pets:Adicionar (pet_serial, _UnitName ("pet"), 0x1114, UnitGUID("player"), _detalhes.playername, 0x514)
|
||||
end
|
||||
end
|
||||
|
||||
else
|
||||
local pet_serial = _UnitGUID("pet")
|
||||
local pet_serial = UnitGUID("pet")
|
||||
if (pet_serial) then
|
||||
if (not _detalhes.tabela_pets.pets [pet_serial]) then
|
||||
_detalhes.tabela_pets:Adicionar (pet_serial, _UnitName ("pet"), 0x1114, _UnitGUID("player"), _detalhes.playername, 0x514)
|
||||
_detalhes.tabela_pets:Adicionar (pet_serial, _UnitName ("pet"), 0x1114, UnitGUID("player"), _detalhes.playername, 0x514)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -223,14 +223,14 @@ function container_pets:Adicionar (pet_serial, pet_nome, pet_flags, dono_serial,
|
||||
end
|
||||
|
||||
function _detalhes:WipePets()
|
||||
return _table_wipe(_detalhes.tabela_pets.pets)
|
||||
return wipe(_detalhes.tabela_pets.pets)
|
||||
end
|
||||
|
||||
function _detalhes:LimparPets()
|
||||
--erase old pet table by creating a new one
|
||||
local newPetTable = {}
|
||||
--minimum of 90 minutes to clean a pet from the pet table data
|
||||
for PetSerial, PetTable in _pairs(_detalhes.tabela_pets.pets) do
|
||||
for PetSerial, PetTable in pairs(_detalhes.tabela_pets.pets) do
|
||||
if ( (PetTable[4] + 5400 > _detalhes._tempo + 1) or (PetTable[5] and PetTable[4] + 43200 > _detalhes._tempo) ) then
|
||||
newPetTable [PetSerial] = PetTable
|
||||
end
|
||||
|
||||
@@ -514,7 +514,7 @@ function segmentClass:resetar()
|
||||
wipe(Details.cache_healing_group)
|
||||
Details:UpdateParserGears()
|
||||
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat ("player")) then
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat("player")) then
|
||||
--workarround for the "script run too long" issue while outside the combat lockdown
|
||||
local cleargarbage = function()
|
||||
collectgarbage()
|
||||
|
||||
@@ -19,11 +19,11 @@ local _
|
||||
local _cstr = string.format --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local _table_sort = table.sort --lua local
|
||||
local _table_insert = table.insert --lua local
|
||||
local tinsert = table.insert --lua local
|
||||
local _table_size = table.getn --lua local
|
||||
local _setmetatable = setmetatable --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _rawget= rawget --lua local
|
||||
local _math_min = math.min --lua local
|
||||
local _math_max = math.max --lua local
|
||||
@@ -32,9 +32,9 @@ local _unpack = unpack --lua local
|
||||
local type = type --lua local
|
||||
|
||||
local _GetSpellInfo = _detalhes.getspellinfo -- api local
|
||||
local _IsInRaid = IsInRaid -- api local
|
||||
local _IsInGroup = IsInGroup -- api local
|
||||
local _GetNumGroupMembers = GetNumGroupMembers -- api local
|
||||
local IsInRaid = IsInRaid -- api local
|
||||
local IsInGroup = IsInGroup -- api local
|
||||
local GetNumGroupMembers = GetNumGroupMembers -- api local
|
||||
local _GetNumPartyMembers = GetNumPartyMembers or GetNumSubgroupMembers -- api local
|
||||
local _GetNumRaidMembers = GetNumRaidMembers or GetNumGroupMembers -- api local
|
||||
local _GetUnitName = GetUnitName -- api local
|
||||
@@ -59,7 +59,7 @@ local temp_table = {}
|
||||
|
||||
local target_func = function(main_table)
|
||||
local i = 1
|
||||
for name, amount in _pairs(main_table) do
|
||||
for name, amount in pairs(main_table) do
|
||||
local t = temp_table [i]
|
||||
if (not t) then
|
||||
t = {"", 0}
|
||||
@@ -75,7 +75,7 @@ end
|
||||
|
||||
local spells_used_func = function(main_table, target)
|
||||
local i = 1
|
||||
for spellid, spell_table in _pairs(main_table) do
|
||||
for spellid, spell_table in pairs(main_table) do
|
||||
local target_amount = spell_table.targets [target]
|
||||
if (target_amount) then
|
||||
local t = temp_table [i]
|
||||
@@ -117,7 +117,7 @@ function atributo_custom:damagedoneTooltip (actor, target, spellid, combat, inst
|
||||
local this_actor = combat (1, targetname)
|
||||
|
||||
if (this_actor) then
|
||||
for name, _ in _pairs(this_actor.damage_from) do
|
||||
for name, _ in pairs(this_actor.damage_from) do
|
||||
local aggressor = combat (1, name)
|
||||
if (aggressor) then
|
||||
local spell = aggressor.spells._ActorTable [spellid]
|
||||
@@ -219,7 +219,7 @@ function atributo_custom:damagedone (actor, source, target, spellid, combat, ins
|
||||
if (spell) then
|
||||
if (target) then
|
||||
if (target == "[all]") then
|
||||
for target_name, amount in _pairs(spell.targets) do
|
||||
for target_name, amount in pairs(spell.targets) do
|
||||
--add amount
|
||||
|
||||
--we need to pass a object here in order to get name and class, so we just get the main damage actor from the combat
|
||||
@@ -236,7 +236,7 @@ function atributo_custom:damagedone (actor, source, target, spellid, combat, ins
|
||||
|
||||
elseif (target == "[raid]") then
|
||||
local roster = combat.raid_roster
|
||||
for target_name, amount in _pairs(spell.targets) do
|
||||
for target_name, amount in pairs(spell.targets) do
|
||||
if (roster [target_name]) then
|
||||
--add amount
|
||||
instance_container:AddValue (combat (1, target_name), amount, true)
|
||||
@@ -289,14 +289,14 @@ function atributo_custom:damagedone (actor, source, target, spellid, combat, ins
|
||||
|
||||
if (target == "[all]") then
|
||||
local total = 0
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
total = total + amount
|
||||
end
|
||||
return total
|
||||
|
||||
elseif (target == "[raid]") then
|
||||
local total = 0
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
if (combat.raid_roster [target_name]) then
|
||||
total = total + amount
|
||||
end
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
local _cstr = string.format --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local _table_sort = table.sort --lua local
|
||||
local _table_insert = table.insert --lua local
|
||||
local tinsert = table.insert --lua local
|
||||
local _table_size = table.getn --lua local
|
||||
local _setmetatable = setmetatable --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _rawget= rawget --lua local
|
||||
local _math_min = math.min --lua local
|
||||
local _math_max = math.max --lua local
|
||||
@@ -25,9 +25,9 @@
|
||||
local type = type --lua local
|
||||
|
||||
local _GetSpellInfo = _detalhes.getspellinfo -- api local
|
||||
local _IsInRaid = IsInRaid -- api local
|
||||
local _IsInGroup = IsInGroup -- api local
|
||||
local _GetNumGroupMembers = GetNumGroupMembers -- api local
|
||||
local IsInRaid = IsInRaid -- api local
|
||||
local IsInGroup = IsInGroup -- api local
|
||||
local GetNumGroupMembers = GetNumGroupMembers -- api local
|
||||
local _GetNumPartyMembers = GetNumPartyMembers or GetNumSubgroupMembers -- api local
|
||||
local _GetNumRaidMembers = GetNumRaidMembers or GetNumGroupMembers -- api local
|
||||
local _GetUnitName = GetUnitName -- api local
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
local target_func = function(main_table)
|
||||
local i = 1
|
||||
for name, amount in _pairs(main_table) do
|
||||
for name, amount in pairs(main_table) do
|
||||
local t = temp_table [i]
|
||||
if (not t) then
|
||||
t = {"", 0}
|
||||
@@ -68,7 +68,7 @@
|
||||
|
||||
local spells_used_func = function(main_table, target)
|
||||
local i = 1
|
||||
for spellid, spell_table in _pairs(main_table) do
|
||||
for spellid, spell_table in pairs(main_table) do
|
||||
local target_amount = spell_table.targets [target]
|
||||
if (target_amount) then
|
||||
local t = temp_table [i]
|
||||
@@ -111,7 +111,7 @@
|
||||
local this_actor = combat (2, targetname)
|
||||
|
||||
if (this_actor) then
|
||||
for name, _ in _pairs(this_actor.healing_from) do
|
||||
for name, _ in pairs(this_actor.healing_from) do
|
||||
local healer = combat (2, name)
|
||||
if (healer) then
|
||||
local spell = healer.spells._ActorTable [spellid]
|
||||
@@ -208,7 +208,7 @@
|
||||
if (spell) then
|
||||
if (target) then
|
||||
if (target == "[all]") then
|
||||
for target_name, amount in _pairs(spell.targets) do
|
||||
for target_name, amount in pairs(spell.targets) do
|
||||
--add amount
|
||||
|
||||
--we need to pass a object here in order to get name and class, so we just get the main heal actor from the combat
|
||||
@@ -225,7 +225,7 @@
|
||||
|
||||
elseif (target == "[raid]") then
|
||||
local roster = combat.raid_roster
|
||||
for target_name, amount in _pairs(spell.targets) do
|
||||
for target_name, amount in pairs(spell.targets) do
|
||||
if (roster [target_name]) then
|
||||
--add amount
|
||||
instance_container:AddValue (combat (1, target_name), amount, true)
|
||||
@@ -278,14 +278,14 @@
|
||||
|
||||
if (target == "[all]") then
|
||||
local total = 0
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
total = total + amount
|
||||
end
|
||||
return total
|
||||
|
||||
elseif (target == "[raid]") then
|
||||
local total = 0
|
||||
for target_name, amount in _pairs(actor.targets) do
|
||||
for target_name, amount in pairs(actor.targets) do
|
||||
if (combat.raid_roster [target_name]) then
|
||||
total = total + amount
|
||||
end
|
||||
|
||||
+6
-6
@@ -59,7 +59,7 @@
|
||||
|
||||
for _, actor in ipairs(Details.tabela_vigente[class_type_dano]._ActorTable) do
|
||||
|
||||
if (not actor.grupo and not actor.owner and not actor.nome:find ("[*]") and bitBand (actor.flag_original, 0x00000060) ~= 0) then --0x20+0x40 neutral + enemy reaction
|
||||
if (not actor.grupo and not actor.owner and not actor.nome:find ("[*]") and bitBand(actor.flag_original, 0x00000060) ~= 0) then --0x20+0x40 neutral + enemy reaction
|
||||
for name, _ in pairs(actor.targets) do
|
||||
if (name == Details.playername) then
|
||||
return actor.nome
|
||||
@@ -161,7 +161,7 @@
|
||||
--catch boss function if any
|
||||
local bossFunction, bossFunctionType = Details:GetBossFunction (ZoneMapID, BossIndex)
|
||||
if (bossFunction) then
|
||||
if (bitBand (bossFunctionType, 0x1) ~= 0) then --realtime
|
||||
if (bitBand(bossFunctionType, 0x1) ~= 0) then --realtime
|
||||
Details.bossFunction = bossFunction
|
||||
Details.tabela_vigente.bossFunction = Details:ScheduleTimer("bossFunction", 1)
|
||||
end
|
||||
@@ -629,7 +629,7 @@
|
||||
else
|
||||
|
||||
--this segment is a boss fight
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat ("player")) then
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat("player")) then
|
||||
|
||||
else
|
||||
--Details.schedule_flag_boss_components = true
|
||||
@@ -644,7 +644,7 @@
|
||||
Details.tabela_vigente.is_boss.killed = true
|
||||
|
||||
--add to storage
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat ("player") and not Details.logoff_saving_data) then
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat("player") and not Details.logoff_saving_data) then
|
||||
local successful, errortext = pcall (Details.Database.StoreEncounter)
|
||||
if (not successful) then
|
||||
Details:Msg("error occurred on Details.Database.StoreEncounter():", errortext)
|
||||
@@ -660,7 +660,7 @@
|
||||
Details:SendEvent("COMBAT_BOSS_WIPE", nil, Details.tabela_vigente)
|
||||
|
||||
--add to storage
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat ("player") and not Details.logoff_saving_data) then
|
||||
if (not InCombatLockdown() and not UnitAffectingCombat("player") and not Details.logoff_saving_data) then
|
||||
local successful, errortext = pcall (Details.Database.StoreWipe)
|
||||
if (not successful) then
|
||||
Details:Msg("error occurred on Details.Database.StoreWipe():", errortext)
|
||||
@@ -702,7 +702,7 @@
|
||||
--encounter boss function
|
||||
local bossFunction, bossFunctionType = Details:GetBossFunction (Details.tabela_vigente.is_boss.mapid or 0, Details.tabela_vigente.is_boss.index or 0)
|
||||
if (bossFunction) then
|
||||
if (bitBand (bossFunctionType, 0x2) ~= 0) then --end of combat
|
||||
if (bitBand(bossFunctionType, 0x2) ~= 0) then --end of combat
|
||||
if (not Details.logoff_saving_data) then
|
||||
local successful, errortext = pcall (bossFunction, Details.tabela_vigente)
|
||||
if (not successful) then
|
||||
|
||||
+3
-3
@@ -1377,7 +1377,7 @@ local create_storage_tables = function()
|
||||
end
|
||||
|
||||
function _detalhes.ScheduleLoadStorage()
|
||||
if (InCombatLockdown() or UnitAffectingCombat ("player")) then
|
||||
if (InCombatLockdown() or UnitAffectingCombat("player")) then
|
||||
if (_detalhes.debug) then
|
||||
print("|cFFFFFF00Details! storage scheduled to load (player in combat).")
|
||||
end
|
||||
@@ -1421,7 +1421,7 @@ function _detalhes.OpenStorage()
|
||||
--check if the storage is already loaded
|
||||
if (not IsAddOnLoaded ("Details_DataStorage")) then
|
||||
--can't open it during combat
|
||||
if (InCombatLockdown() or UnitAffectingCombat ("player")) then
|
||||
if (InCombatLockdown() or UnitAffectingCombat("player")) then
|
||||
if (_detalhes.debug) then
|
||||
print("|cFFFFFF00Details! Storage|r: can't load storage due to combat.")
|
||||
end
|
||||
@@ -2045,7 +2045,7 @@ function ilvl_core:GetItemLevel (unitid, guid, is_forced, try_number)
|
||||
end
|
||||
|
||||
--ddouble check
|
||||
if (not is_forced and (UnitAffectingCombat ("player") or InCombatLockdown())) then
|
||||
if (not is_forced and (UnitAffectingCombat("player") or InCombatLockdown())) then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
+5
-5
@@ -6,13 +6,13 @@
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--local pointers
|
||||
local _
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _rawget = rawget --lua local
|
||||
local _setmetatable = setmetatable --lua local
|
||||
local _table_remove = table.remove --lua local
|
||||
local _bit_band = bit.band --lua local
|
||||
local _table_wipe = table.wipe --lua local
|
||||
local wipe = table.wipe --lua local
|
||||
local _time = time --lua local
|
||||
|
||||
local _InCombatLockdown = InCombatLockdown --wow api local
|
||||
@@ -743,7 +743,7 @@
|
||||
|
||||
--desativado 7.2.5 veio com algum bug e a checagem de memoria esta sendo feita durante o combate
|
||||
function _detalhes:CheckMemoryAfterCombat()
|
||||
if (_detalhes.next_memory_check < time() and not InCombatLockdown() and not UnitAffectingCombat ("player")) then
|
||||
if (_detalhes.next_memory_check < time() and not InCombatLockdown() and not UnitAffectingCombat("player")) then
|
||||
_detalhes.next_memory_check = time()+_detalhes.intervalo_memoria
|
||||
UpdateAddOnMemoryUsage()
|
||||
local memory = GetAddOnMemoryUsage ("Details")
|
||||
@@ -754,7 +754,7 @@
|
||||
end
|
||||
|
||||
function _detalhes:CheckMemoryPeriodically()
|
||||
if (_detalhes.next_memory_check <= time() and not _InCombatLockdown() and not _detalhes.in_combat and not UnitAffectingCombat ("player")) then
|
||||
if (_detalhes.next_memory_check <= time() and not _InCombatLockdown() and not _detalhes.in_combat and not UnitAffectingCombat("player")) then
|
||||
_detalhes.next_memory_check = time() + _detalhes.intervalo_memoria - 3
|
||||
UpdateAddOnMemoryUsage()
|
||||
local memory = GetAddOnMemoryUsage ("Details")
|
||||
@@ -841,7 +841,7 @@
|
||||
_detalhes:ResetSpecCache()
|
||||
|
||||
--wipa container de escudos
|
||||
_table_wipe(_detalhes.escudos)
|
||||
wipe(_detalhes.escudos)
|
||||
|
||||
_detalhes.ultima_coleta = _detalhes._tempo
|
||||
|
||||
|
||||
+207
-214
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--local pointers
|
||||
|
||||
local _pairs = pairs --lua locals
|
||||
local pairs = pairs --lua locals
|
||||
local _math_floor = math.floor --lua locals
|
||||
|
||||
local _UnitAura = UnitAura
|
||||
@@ -276,7 +276,7 @@
|
||||
return
|
||||
end
|
||||
|
||||
for SpellId, DebuffTable in _pairs(SoloDebuffUptime) do
|
||||
for SpellId, DebuffTable in pairs(SoloDebuffUptime) do
|
||||
if (DebuffTable.start) then
|
||||
DebuffTable.duration = DebuffTable.duration + (_detalhes._tempo - DebuffTable.start) --time do parser ser� igual ao time()?
|
||||
DebuffTable.start = nil
|
||||
@@ -290,7 +290,7 @@
|
||||
--reset bufftables
|
||||
_detalhes.SoloTables.SoloBuffUptime = _detalhes.SoloTables.SoloBuffUptime or {}
|
||||
|
||||
for spellname, BuffTable in _pairs(_detalhes.SoloTables.SoloBuffUptime) do
|
||||
for spellname, BuffTable in pairs(_detalhes.SoloTables.SoloBuffUptime) do
|
||||
--local BuffEntryTable = _detalhes.SoloTables.BuffTextEntry [BuffTable.tableIndex]
|
||||
|
||||
if (BuffTable.Active) then
|
||||
@@ -314,7 +314,7 @@
|
||||
for buffIndex = 1, 41 do
|
||||
local name = _UnitAura ("player", buffIndex)
|
||||
if (name) then
|
||||
for index, BuffName in _pairs(_detalhes.SoloTables.BuffsTableNameCache) do
|
||||
for index, BuffName in pairs(_detalhes.SoloTables.BuffsTableNameCache) do
|
||||
if (BuffName == name) then
|
||||
local BuffObject = _detalhes.SoloTables.SoloBuffUptime [name]
|
||||
if (not BuffObject) then
|
||||
|
||||
@@ -143,7 +143,7 @@ do
|
||||
background:SetPoint("bottomright", 0, 0)
|
||||
PluginDescPanel.background = background
|
||||
|
||||
local icon, title, desc = PluginDescPanel:CreateTexture(nil, "overlay"), PluginDescPanel:CreateFontString (nil, "overlay", "GameFontNormal"), PluginDescPanel:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local icon, title, desc = PluginDescPanel:CreateTexture(nil, "overlay"), PluginDescPanel:CreateFontString(nil, "overlay", "GameFontNormal"), PluginDescPanel:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
icon:SetPoint("topleft", 10, -10)
|
||||
icon:SetSize(16, 16)
|
||||
title:SetPoint("left", icon, "right", 2, 0)
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--local pointers
|
||||
|
||||
local _table_insert = table.insert --lua local
|
||||
local tinsert = table.insert --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local _time = time --lua local
|
||||
|
||||
local _GetTime = GetTime --api local
|
||||
local GetTime = GetTime --api local
|
||||
|
||||
local timeMachine = _detalhes.timeMachine --details local
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
timeMachine.ligada = false
|
||||
|
||||
local calc_for_pvp = function(self)
|
||||
for tipo, tabela in _pairs(self.tabelas) do
|
||||
for tipo, tabela in pairs(self.tabelas) do
|
||||
for nome, jogador in ipairs(tabela) do
|
||||
if (jogador) then
|
||||
if (jogador.last_event+3 > _tempo) then --okey o jogador esta dando dps
|
||||
@@ -46,7 +46,7 @@
|
||||
end
|
||||
|
||||
local calc_for_pve = function(self)
|
||||
for tipo, tabela in _pairs(self.tabelas) do
|
||||
for tipo, tabela in pairs(self.tabelas) do
|
||||
for nome, jogador in ipairs(tabela) do
|
||||
if (jogador) then
|
||||
if (jogador.last_event+10 > _tempo) then --okey o jogador esta dando dps
|
||||
@@ -125,7 +125,7 @@
|
||||
end
|
||||
|
||||
local esta_tabela = timeMachine.tabelas [self.tipo]
|
||||
_table_insert (esta_tabela, self)
|
||||
tinsert (esta_tabela, self)
|
||||
self.timeMachine = #esta_tabela
|
||||
end
|
||||
|
||||
|
||||
+27
-27
@@ -9,7 +9,7 @@
|
||||
|
||||
local upper = string.upper --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local _math_max = math.max --lua local
|
||||
local _math_min = math.min --lua local
|
||||
@@ -18,16 +18,16 @@
|
||||
local _string_match = string.match --lua local
|
||||
local _string_format = string.format --lua local
|
||||
local loadstring = loadstring --lua local
|
||||
local _select = select
|
||||
local _tonumber = tonumber
|
||||
local _strsplit = strsplit
|
||||
local select = select
|
||||
local tonumber = tonumber
|
||||
local strsplit = strsplit
|
||||
local _pcall = pcall
|
||||
local _GetTime = GetTime
|
||||
local GetTime = GetTime
|
||||
|
||||
local _IsInRaid = IsInRaid --wow api local
|
||||
local _IsInGroup = IsInGroup --wow api local
|
||||
local _GetNumGroupMembers = GetNumGroupMembers --wow api local
|
||||
local _UnitAffectingCombat = UnitAffectingCombat --wow api local
|
||||
local IsInRaid = IsInRaid --wow api local
|
||||
local IsInGroup = IsInGroup --wow api local
|
||||
local GetNumGroupMembers = GetNumGroupMembers --wow api local
|
||||
local UnitAffectingCombat = UnitAffectingCombat --wow api local
|
||||
local _InCombatLockdown = InCombatLockdown --wow api local
|
||||
|
||||
local gump = _detalhes.gump --details local
|
||||
@@ -291,9 +291,9 @@
|
||||
|
||||
--get the npc id from guid
|
||||
function _detalhes:GetNpcIdFromGuid (guid)
|
||||
local NpcId = _select( 6, _strsplit ( "-", guid ) )
|
||||
local NpcId = select( 6, strsplit( "-", guid ) )
|
||||
if (NpcId) then
|
||||
return _tonumber ( NpcId )
|
||||
return tonumber ( NpcId )
|
||||
end
|
||||
return 0
|
||||
end
|
||||
@@ -349,7 +349,7 @@
|
||||
--set all table keys to lower
|
||||
local temptable = {}
|
||||
function _detalhes:LowerizeKeys (_table)
|
||||
for key, value in _pairs(_table) do
|
||||
for key, value in pairs(_table) do
|
||||
temptable [string.lower (key)] = value
|
||||
end
|
||||
temptable, _table = table.wipe (_table), temptable
|
||||
@@ -767,7 +767,7 @@
|
||||
--remove a index from a hash table
|
||||
function _detalhes:tableRemove (tabela, indexName)
|
||||
local newtable = {}
|
||||
for hash, value in _pairs(tabela) do
|
||||
for hash, value in pairs(tabela) do
|
||||
if (hash ~= indexName) then
|
||||
newtable [hash] = value
|
||||
end
|
||||
@@ -820,11 +820,11 @@
|
||||
return t1
|
||||
end
|
||||
|
||||
function _detalhes.table.deploy (t1, t2)
|
||||
function _detalhes.table.deploy(t1, t2)
|
||||
for key, value in pairs(t2) do
|
||||
if (type(value) == "table") then
|
||||
t1 [key] = t1 [key] or {}
|
||||
_detalhes.table.deploy (t1 [key], t2 [key])
|
||||
_detalhes.table.deploy(t1 [key], t2 [key])
|
||||
elseif (t1 [key] == nil) then
|
||||
t1 [key] = value
|
||||
end
|
||||
@@ -1120,19 +1120,19 @@ end
|
||||
return true
|
||||
|
||||
--is in combat
|
||||
elseif (_UnitAffectingCombat("player")) then
|
||||
elseif (UnitAffectingCombat("player")) then
|
||||
return true
|
||||
|
||||
elseif (_IsInRaid()) then
|
||||
for i = 1, _GetNumGroupMembers(), 1 do
|
||||
if (_UnitAffectingCombat ("raid"..i)) then
|
||||
elseif (IsInRaid()) then
|
||||
for i = 1, GetNumGroupMembers(), 1 do
|
||||
if (UnitAffectingCombat("raid"..i)) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
elseif (_IsInGroup()) then
|
||||
for i = 1, _GetNumGroupMembers()-1, 1 do
|
||||
if (_UnitAffectingCombat ("party"..i)) then
|
||||
elseif (IsInGroup()) then
|
||||
for i = 1, GetNumGroupMembers()-1, 1 do
|
||||
if (UnitAffectingCombat("party"..i)) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
@@ -1154,15 +1154,15 @@ end
|
||||
end
|
||||
|
||||
function _detalhes:FindGUIDFromName (name)
|
||||
if (_IsInRaid()) then
|
||||
for i = 1, _GetNumGroupMembers(), 1 do
|
||||
if (IsInRaid()) then
|
||||
for i = 1, GetNumGroupMembers(), 1 do
|
||||
local this_name, _ = UnitName ("raid"..i)
|
||||
if (this_name == name) then
|
||||
return UnitGUID("raid"..i)
|
||||
end
|
||||
end
|
||||
elseif (_IsInGroup()) then
|
||||
for i = 1, _GetNumGroupMembers()-1, 1 do
|
||||
elseif (IsInGroup()) then
|
||||
for i = 1, GetNumGroupMembers()-1, 1 do
|
||||
local this_name, _ = UnitName ("party"..i)
|
||||
if (this_name == name) then
|
||||
return UnitGUID("party"..i)
|
||||
@@ -1197,7 +1197,7 @@ end
|
||||
|
||||
if (not ThisGradient.done) then
|
||||
|
||||
local percent = _math_min((_GetTime() - ThisGradient.TimeStart) / ThisGradient.Duration * 100, 100)
|
||||
local percent = _math_min((GetTime() - ThisGradient.TimeStart) / ThisGradient.Duration * 100, 100)
|
||||
local red_now = ThisGradient.StartRed + (percent * ThisGradient.OnePercentRed)
|
||||
local green_now = ThisGradient.StartGreen + (percent * ThisGradient.OnePercentGreen)
|
||||
local blue_now = ThisGradient.StartBlue + (percent * ThisGradient.OnePercentBlue)
|
||||
|
||||
+1
-1
@@ -1249,7 +1249,7 @@
|
||||
|
||||
--updatewindow_frame.TitleText:SetText("A New Version Is Available!") --10.0 fuck
|
||||
|
||||
updatewindow_frame.midtext = updatewindow_frame:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
updatewindow_frame.midtext = updatewindow_frame:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
updatewindow_frame.midtext:SetText("Good news everyone!\nA new version has been forged and is waiting to be looted.")
|
||||
updatewindow_frame.midtext:SetPoint("topleft", updatewindow_frame, "topleft", 10, -90)
|
||||
updatewindow_frame.midtext:SetJustifyH("center")
|
||||
|
||||
+2
-2
@@ -289,7 +289,7 @@ function _detalhes.PlayBestDamageOnGuild (damage)
|
||||
|
||||
----------------------------------------------
|
||||
|
||||
local NewDamageRecord = DetailsNewDamageRecord:CreateFontString ("NewDamageRecordFontString", "OVERLAY")
|
||||
local NewDamageRecord = DetailsNewDamageRecord:CreateFontString("NewDamageRecordFontString", "OVERLAY")
|
||||
NewDamageRecord:SetFont ([=[Fonts\FRIZQT__.TTF]=], 12, "OUTLINE")
|
||||
NewDamageRecord:SetText("Damage Record!")
|
||||
NewDamageRecord:SetDrawLayer ("OVERLAY", 0)
|
||||
@@ -328,7 +328,7 @@ function _detalhes.PlayBestDamageOnGuild (damage)
|
||||
|
||||
----------------------------------------------
|
||||
|
||||
local DamageAmount = DetailsNewDamageRecord:CreateFontString ("DamageAmountFontString", "OVERLAY")
|
||||
local DamageAmount = DetailsNewDamageRecord:CreateFontString("DamageAmountFontString", "OVERLAY")
|
||||
DamageAmount:SetFont ([=[Fonts\FRIZQT__.TTF]=], 12, "THICKOUTLINE")
|
||||
DamageAmount:SetText(_detalhes:comma_value (damage))
|
||||
DamageAmount:SetDrawLayer ("OVERLAY", 0)
|
||||
|
||||
+3
-3
@@ -7,7 +7,7 @@ local CreateFrame = CreateFrame
|
||||
local GetTime = GetTime
|
||||
local GetCursorPosition = GetCursorPosition
|
||||
local GameTooltip = GameTooltip
|
||||
local _select = select
|
||||
local select = select
|
||||
|
||||
local _detalhes = _G._detalhes
|
||||
local gump = _detalhes.gump
|
||||
@@ -17,7 +17,7 @@ function gump:NewLabel2 (parent, container, member, text, font, size, color)
|
||||
|
||||
font = font or "GameFontHighlightSmall"
|
||||
|
||||
local newFontString = parent:CreateFontString (nil, "OVERLAY", font)
|
||||
local newFontString = parent:CreateFontString(nil, "OVERLAY", font)
|
||||
if (member) then
|
||||
container [member] = newFontString
|
||||
end
|
||||
@@ -71,7 +71,7 @@ function gump:NewDetailsButton (parent, container, instancia, func, param1, para
|
||||
new_button:SetDisabledTexture (pic_disabled)
|
||||
new_button:SetHighlightTexture(pic_highlight, "ADD")
|
||||
|
||||
local new_text = new_button:CreateFontString (nil, "OVERLAY", "GameFontNormal")
|
||||
local new_text = new_button:CreateFontString(nil, "OVERLAY", "GameFontNormal")
|
||||
new_text:SetPoint("center", new_button, "center")
|
||||
new_button.text = new_text
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ local libwindow = LibStub("LibWindow-1.1")
|
||||
f.Close:SetScript("OnClick", function() f:Hide() end)
|
||||
|
||||
--title
|
||||
f.Title = f.TitleBar:CreateFontString ("$parentTitle", "overlay", "GameFontNormal")
|
||||
f.Title = f.TitleBar:CreateFontString("$parentTitle", "overlay", "GameFontNormal")
|
||||
f.Title:SetPoint("center", f.TitleBar, "center")
|
||||
f.Title:SetTextColor (.8, .8, .8, 1)
|
||||
f.Title:SetText("Details! Benchmark")
|
||||
|
||||
@@ -464,7 +464,7 @@ function Details:CreateCurrentDpsFrame(parent, name)
|
||||
rightOrnamentTexture:SetAlpha(0.6)
|
||||
|
||||
--title bar
|
||||
local TitleString = f:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local TitleString = f:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
TitleString:SetPoint("top", f, "top", 0, -5)
|
||||
TitleString:SetText("Details! Arena Real Time DPS Tracker")
|
||||
DF:SetFontSize (TitleString, 9)
|
||||
@@ -498,12 +498,12 @@ function Details:CreateCurrentDpsFrame(parent, name)
|
||||
end
|
||||
|
||||
--labels for mythic dungeon / group party
|
||||
local labelGroupDamage = f:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local labelGroupDamage = f:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
labelGroupDamage:SetText("Real Time Group DPS")
|
||||
DF:SetFontSize (labelGroupDamage, 14)
|
||||
DF:SetFontOutline (labelGroupDamage, "NONE")
|
||||
|
||||
local labelGroupDamage_DPS = f:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local labelGroupDamage_DPS = f:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
labelGroupDamage_DPS:SetText("0")
|
||||
|
||||
labelGroupDamage:SetPoint("center", f, "center", 0, 10)
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
local _math_ceil = math.ceil --lua local
|
||||
local _math_floor = math.floor --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local _string_lower = string.lower --lua local
|
||||
local _table_sort = table.sort --lua local
|
||||
local _table_insert = table.insert --lua local
|
||||
local tinsert = table.insert --lua local
|
||||
local _unpack = unpack --lua local
|
||||
local _setmetatable = setmetatable --lua local
|
||||
|
||||
local _GetSpellInfo = _detalhes.getspellinfo --api local
|
||||
local _CreateFrame = CreateFrame --api local
|
||||
local _GetTime = GetTime --api local
|
||||
local GetTime = GetTime --api local
|
||||
local _GetCursorPosition = GetCursorPosition --api local
|
||||
local _GameTooltip = GameTooltip --api local
|
||||
local UIParent = UIParent --api local
|
||||
@@ -1014,7 +1014,7 @@
|
||||
button.icon:SetTexture([[Interface\AddOns\Details\images\custom_icones]])
|
||||
button.icon:SetTexCoord (p*(i-1), p*(i), 0, 1)
|
||||
|
||||
button.text = button:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
button.text = button:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
button.text:SetPoint("left", button.icon, "right", 4, 0)
|
||||
button.text:SetText(attributes [i] and attributes [i].label or "")
|
||||
button.text:SetTextColor (.9, .9, .9, 1)
|
||||
@@ -1733,7 +1733,7 @@
|
||||
local script = code_editor:GetText()
|
||||
local func, errortext = loadstring (script)
|
||||
if (not func) then
|
||||
local firstLine = strsplit ("\n", script, 2)
|
||||
local firstLine = strsplit("\n", script, 2)
|
||||
errortext = errortext:gsub (firstLine, "")
|
||||
errortext = errortext:gsub ("%[string \"", "")
|
||||
errortext = errortext:gsub ("...\"]:", "")
|
||||
|
||||
@@ -362,11 +362,11 @@ function Details:CreateEventTrackerFrame(parent, name)
|
||||
local righticon = statusbar:CreateTexture("$parentRightIcon", "overlay")
|
||||
righticon:SetPoint("right", line, "right", 0, 0)
|
||||
|
||||
local lefttext = statusbar:CreateFontString ("$parentLeftText", "overlay", "GameFontNormal")
|
||||
local lefttext = statusbar:CreateFontString("$parentLeftText", "overlay", "GameFontNormal")
|
||||
DF:SetFontSize (lefttext, 9)
|
||||
lefttext:SetPoint("left", lefticon, "right", 2, 0)
|
||||
|
||||
local righttext = statusbar:CreateFontString ("$parentRightText", "overlay", "GameFontNormal")
|
||||
local righttext = statusbar:CreateFontString("$parentRightText", "overlay", "GameFontNormal")
|
||||
DF:SetFontSize (righttext, 9)
|
||||
righttext:SetPoint("right", righticon, "left", -2, 0)
|
||||
|
||||
@@ -591,7 +591,7 @@ function Details:CreateEventTrackerFrame(parent, name)
|
||||
end
|
||||
|
||||
--title text
|
||||
local TitleString = f:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local TitleString = f:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
TitleString:SetPoint("top", f, "top", 0, -3)
|
||||
TitleString:SetText("Details!: Event Tracker")
|
||||
local TitleBackground = f:CreateTexture(nil, "artwork")
|
||||
|
||||
+15
-15
@@ -61,7 +61,7 @@ function Details:OpenForge()
|
||||
end
|
||||
|
||||
if (not have_plugins_enabled and false) then
|
||||
local nopluginLabel = f:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local nopluginLabel = f:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
local nopluginIcon = f:CreateTexture(nil, "overlay")
|
||||
nopluginIcon:SetPoint("bottomleft", f, "bottomleft", 10, 10)
|
||||
nopluginIcon:SetSize(16, 16)
|
||||
@@ -164,7 +164,7 @@ function Details:OpenForge()
|
||||
w:SetSize(600, 20)
|
||||
w:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_PLAYERNAME"] .. ": ")
|
||||
label:SetPoint("left", w, "left", 5, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeAllPlayersNameFilter")
|
||||
@@ -228,7 +228,7 @@ function Details:OpenForge()
|
||||
w:SetSize(600, 20)
|
||||
w:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_PETNAME"] .. ": ")
|
||||
label:SetPoint("left", w, "left", 5, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeAllPetsNameFilter")
|
||||
@@ -236,7 +236,7 @@ function Details:OpenForge()
|
||||
entry:SetPoint("left", label, "right", 2, 0)
|
||||
entry:SetTemplate(Details.gump:GetTemplate("button", "OPTIONS_BUTTON_TEMPLATE"))
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_OWNERNAME"] .. ": ")
|
||||
label:SetPoint("left", entry.widget, "right", 20, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeAllPetsOwnerFilter")
|
||||
@@ -315,7 +315,7 @@ function Details:OpenForge()
|
||||
w:SetSize(600, 20)
|
||||
w:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_ENEMYNAME"] .. ": ")
|
||||
label:SetPoint("left", w, "left", 5, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeAllEnemiesNameFilter")
|
||||
@@ -412,7 +412,7 @@ function Details:OpenForge()
|
||||
w:SetSize(600, 20)
|
||||
w:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_SPELLNAME"] .. ": ")
|
||||
label:SetPoint("left", w, "left", 5, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeAllSpellsNameFilter")
|
||||
@@ -420,7 +420,7 @@ function Details:OpenForge()
|
||||
entry:SetPoint("left", label, "right", 2, 0)
|
||||
entry:SetTemplate(Details.gump:GetTemplate("button", "OPTIONS_BUTTON_TEMPLATE"))
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_CASTERNAME"] .. ": ")
|
||||
label:SetPoint("left", entry.widget, "right", 20, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeAllSpellsCasterFilter")
|
||||
@@ -542,7 +542,7 @@ function Details:OpenForge()
|
||||
w:SetSize(600, 20)
|
||||
w:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_SPELLNAME"] .. ": ")
|
||||
label:SetPoint("left", w, "left", 5, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeEncounterSpellsNameFilter")
|
||||
@@ -550,7 +550,7 @@ function Details:OpenForge()
|
||||
entry:SetPoint("left", label, "right", 2, 0)
|
||||
entry:SetTemplate(Details.gump:GetTemplate("button", "OPTIONS_BUTTON_TEMPLATE"))
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_CASTERNAME"] .. ": ")
|
||||
label:SetPoint("left", entry.widget, "right", 20, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeEncounterSpellsCasterFilter")
|
||||
@@ -558,7 +558,7 @@ function Details:OpenForge()
|
||||
entry:SetPoint("left", label, "right", 2, 0)
|
||||
entry:SetTemplate(Details.gump:GetTemplate("button", "OPTIONS_BUTTON_TEMPLATE"))
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_ENCOUNTERNAME"] .. ": ")
|
||||
label:SetPoint("left", entry.widget, "right", 20, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeEncounterSpellsEncounterFilter")
|
||||
@@ -702,7 +702,7 @@ function Details:OpenForge()
|
||||
npcIdFrame:SetSize(600, 20)
|
||||
npcIdFrame:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
|
||||
local filterSpellNameLabel = npcIdFrame:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local filterSpellNameLabel = npcIdFrame:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
filterSpellNameLabel:SetText(L["STRING_FORGE_FILTER_SPELLNAME"] .. ": ")
|
||||
filterSpellNameLabel:SetPoint("left", npcIdFrame, "left", 5, 0)
|
||||
|
||||
@@ -797,7 +797,7 @@ function Details:OpenForge()
|
||||
w:SetSize(600, 20)
|
||||
w:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_BARTEXT"] .. ": ")
|
||||
label:SetPoint("left", w, "left", 5, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeDBMBarsTextFilter")
|
||||
@@ -805,7 +805,7 @@ function Details:OpenForge()
|
||||
entry:SetPoint("left", label, "right", 2, 0)
|
||||
entry:SetTemplate(Details.gump:GetTemplate("button", "OPTIONS_BUTTON_TEMPLATE"))
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_ENCOUNTERNAME"] .. ": ")
|
||||
label:SetPoint("left", entry.widget, "right", 20, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeDBMBarsEncounterFilter")
|
||||
@@ -928,7 +928,7 @@ function Details:OpenForge()
|
||||
w:SetSize(600, 20)
|
||||
w:SetPoint("topleft", f, "topleft", 164, -40)
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_BARTEXT"] .. ": ")
|
||||
label:SetPoint("left", w, "left", 5, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeBigWigsBarsTextFilter")
|
||||
@@ -936,7 +936,7 @@ function Details:OpenForge()
|
||||
entry:SetPoint("left", label, "right", 2, 0)
|
||||
entry:SetTemplate(Details.gump:GetTemplate("button", "OPTIONS_BUTTON_TEMPLATE"))
|
||||
--
|
||||
local label = w:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local label = w:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
label:SetText(L["STRING_FORGE_FILTER_ENCOUNTERNAME"] .. ": ")
|
||||
label:SetPoint("left", entry.widget, "right", 20, 0)
|
||||
local entry = fw:CreateTextEntry (w, nil, 120, 20, "entry", "DetailsForgeBWBarsEncounterFilter")
|
||||
|
||||
@@ -16,7 +16,7 @@ local abs = _G.abs
|
||||
local unpack = unpack
|
||||
--api locals
|
||||
local CreateFrame = CreateFrame
|
||||
local _GetTime = GetTime
|
||||
local GetTime = GetTime
|
||||
local _GetCursorPosition = GetCursorPosition
|
||||
local UIParent = UIParent
|
||||
local _IsAltKeyDown = IsAltKeyDown
|
||||
@@ -1933,7 +1933,7 @@ local lineScript_Onmousedown = function(self, button)
|
||||
|
||||
self._instance:HandleTextsOnMouseClick (self, "down")
|
||||
|
||||
self.mouse_down = _GetTime()
|
||||
self.mouse_down = GetTime()
|
||||
self.button = button
|
||||
local x, y = _GetCursorPosition()
|
||||
self.x = floor(x)
|
||||
@@ -1964,7 +1964,7 @@ local lineScript_Onmouseup = function(self, button)
|
||||
x = floor(x)
|
||||
y = floor(y)
|
||||
|
||||
if (self.mouse_down and (self.mouse_down+0.4 > _GetTime() and (x == self.x and y == self.y)) or (x == self.x and y == self.y)) then
|
||||
if (self.mouse_down and (self.mouse_down+0.4 > GetTime() and (x == self.x and y == self.y)) or (x == self.x and y == self.y)) then
|
||||
if (self.button == "LeftButton" or self.button == "MiddleButton") then
|
||||
if (self._instance.atributo == 5 or is_shift_down) then
|
||||
--report
|
||||
|
||||
@@ -4889,13 +4889,13 @@ do
|
||||
|
||||
tinsert(_G.UISpecialFrames, "DetailsLoadWallpaperImage")
|
||||
|
||||
local t = f:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local t = f:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
t:SetText(Loc ["STRING_OPTIONS_WALLPAPER_LOAD_EXCLAMATION"])
|
||||
t:SetPoint("topleft", f, "topleft", 15, -25)
|
||||
t:SetJustifyH("left")
|
||||
f.t = t
|
||||
|
||||
local filename = f:CreateFontString (nil, "overlay", "GameFontHighlightLeft")
|
||||
local filename = f:CreateFontString(nil, "overlay", "GameFontHighlightLeft")
|
||||
filename:SetPoint("topleft", f, "topleft", 15, -128)
|
||||
filename:SetText(Loc ["STRING_OPTIONS_WALLPAPER_LOAD_FILENAME"])
|
||||
|
||||
|
||||
+115
-115
@@ -10,11 +10,11 @@ local _
|
||||
--local _string_len = string.len
|
||||
local _math_floor = math.floor
|
||||
local ipairs = ipairs
|
||||
local _pairs = pairs
|
||||
local pairs = pairs
|
||||
local type = type
|
||||
--api locals
|
||||
local _CreateFrame = CreateFrame
|
||||
local _GetTime = GetTime
|
||||
local GetTime = GetTime
|
||||
local _GetSpellInfo = _detalhes.getspellinfo
|
||||
local _GetCursorPosition = GetCursorPosition
|
||||
local _unpack = unpack
|
||||
@@ -619,12 +619,12 @@ function gump:CriaDetalheInfo (index)
|
||||
info.bg:SetValue(100)
|
||||
info.bg:SetSize(320, 47)
|
||||
|
||||
info.nome = info.bg:CreateFontString (nil, "OVERLAY", "GameFontNormal")
|
||||
info.nome2 = info.bg:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano = info.bg:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano_porcento = info.bg:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano_media = info.bg:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano_dps = info.bg:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.nome = info.bg:CreateFontString(nil, "OVERLAY", "GameFontNormal")
|
||||
info.nome2 = info.bg:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano = info.bg:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano_porcento = info.bg:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano_media = info.bg:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
info.dano_dps = info.bg:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
|
||||
info.bg.overlay = info.bg:CreateTexture("DetailsPlayerDetailsWindow_DetalheInfoBG_Overlay" .. index, "ARTWORK")
|
||||
info.bg.overlay:SetTexture("Interface\\AddOns\\Details\\images\\overlay_detalhes")
|
||||
@@ -815,19 +815,19 @@ end
|
||||
--cria os textos em geral da janela info
|
||||
------------------------------------------------------------------------------------------------------------------------------
|
||||
local function cria_textos (este_gump, SWW)
|
||||
este_gump.nome = este_gump:CreateFontString (nil, "OVERLAY", "QuestFont_Large")
|
||||
este_gump.nome = este_gump:CreateFontString(nil, "OVERLAY", "QuestFont_Large")
|
||||
este_gump.nome:SetPoint("TOPLEFT", este_gump, "TOPLEFT", 105, -54)
|
||||
|
||||
este_gump.atributo_nome = este_gump:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
este_gump.atributo_nome = este_gump:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
|
||||
este_gump.targets = SWW:CreateFontString (nil, "OVERLAY", "QuestFont_Large")
|
||||
este_gump.targets = SWW:CreateFontString(nil, "OVERLAY", "QuestFont_Large")
|
||||
este_gump.targets:SetPoint("TOPLEFT", este_gump, "TOPLEFT", 24, -273)
|
||||
este_gump.targets:SetText(Loc ["STRING_TARGETS"] .. ":")
|
||||
|
||||
este_gump.avatar = este_gump:CreateTexture(nil, "overlay")
|
||||
este_gump.avatar_bg = este_gump:CreateTexture(nil, "overlay")
|
||||
este_gump.avatar_attribute = este_gump:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
este_gump.avatar_nick = este_gump:CreateFontString (nil, "overlay", "QuestFont_Large")
|
||||
este_gump.avatar_attribute = este_gump:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
este_gump.avatar_nick = este_gump:CreateFontString(nil, "overlay", "QuestFont_Large")
|
||||
este_gump.avatar:SetDrawLayer ("overlay", 3)
|
||||
este_gump.avatar_bg:SetDrawLayer ("overlay", 2)
|
||||
este_gump.avatar_nick:SetDrawLayer ("overlay", 4)
|
||||
@@ -1728,12 +1728,12 @@ function gump:CriaJanelaInfo()
|
||||
este_gump.apoio_icone_direito:SetHeight(13)
|
||||
|
||||
|
||||
este_gump.topright_text1 = este_gump:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
este_gump.topright_text1 = este_gump:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
este_gump.topright_text1:SetPoint("bottomright", este_gump, "topright", -18 - (94 * (1-1)), -36)
|
||||
este_gump.topright_text1:SetJustifyH("right")
|
||||
_detalhes.gump:SetFontSize (este_gump.topright_text1, 10)
|
||||
|
||||
este_gump.topright_text2 = este_gump:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
este_gump.topright_text2 = este_gump:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
este_gump.topright_text2:SetPoint("bottomright", este_gump, "topright", -18 - (94 * (1-1)), -48)
|
||||
este_gump.topright_text2:SetJustifyH("right")
|
||||
_detalhes.gump:SetFontSize (este_gump.topright_text2, 10)
|
||||
@@ -1811,7 +1811,7 @@ function gump:CriaJanelaInfo()
|
||||
este_gump.no_targets:SetTexCoord (0.015625, 1, 0.01171875, 0.390625)
|
||||
este_gump.no_targets:SetDesaturated(true)
|
||||
este_gump.no_targets:SetAlpha(.7)
|
||||
este_gump.no_targets.text = SWW:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
este_gump.no_targets.text = SWW:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
este_gump.no_targets.text:SetPoint("center", este_gump.no_targets, "center")
|
||||
este_gump.no_targets.text:SetText(Loc ["STRING_NO_TARGET_BOX"])
|
||||
este_gump.no_targets.text:SetTextColor (1, 1, 1, .4)
|
||||
@@ -1959,7 +1959,7 @@ function gump:CriaJanelaInfo()
|
||||
local avoidance_create = function(tab, frame)
|
||||
|
||||
--Percent Desc
|
||||
local percent_desc = frame:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local percent_desc = frame:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
percent_desc:SetText("Percent values are comparisons with the previous try.")
|
||||
percent_desc:SetPoint("bottomleft", frame, "bottomleft", 13, 13 + PLAYER_DETAILS_STATUSBAR_HEIGHT)
|
||||
percent_desc:SetTextColor (.5, .5, .5, 1)
|
||||
@@ -1974,19 +1974,19 @@ function gump:CriaJanelaInfo()
|
||||
local y = -5
|
||||
local padding = 16
|
||||
|
||||
local summary_text = summaryBox:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local summary_text = summaryBox:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
summary_text:SetText("Summary")
|
||||
summary_text :SetPoint("topleft", summaryBox, "topleft", 5, y)
|
||||
|
||||
y = y - padding
|
||||
|
||||
--total damage received
|
||||
local damagereceived = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local damagereceived = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
damagereceived:SetPoint("topleft", summaryBox, "topleft", 15, y)
|
||||
damagereceived:SetText("Total Damage Taken:") --localize-me
|
||||
damagereceived:SetTextColor (.8, .8, .8, 1)
|
||||
|
||||
local damagereceived_amt = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local damagereceived_amt = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
damagereceived_amt:SetPoint("left", damagereceived, "right", 2, 0)
|
||||
damagereceived_amt:SetText("0")
|
||||
tab.damagereceived = damagereceived_amt
|
||||
@@ -1994,11 +1994,11 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
--per second
|
||||
local damagepersecond = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local damagepersecond = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
damagepersecond:SetPoint("topleft", summaryBox, "topleft", 20, y)
|
||||
damagepersecond:SetText("Per Second:") --localize-me
|
||||
|
||||
local damagepersecond_amt = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local damagepersecond_amt = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
damagepersecond_amt:SetPoint("left", damagepersecond, "right", 2, 0)
|
||||
damagepersecond_amt:SetText("0")
|
||||
tab.damagepersecond = damagepersecond_amt
|
||||
@@ -2006,12 +2006,12 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
--total absorbs
|
||||
local absorbstotal = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local absorbstotal = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
absorbstotal:SetPoint("topleft", summaryBox, "topleft", 15, y)
|
||||
absorbstotal:SetText("Total Absorbs:") --localize-me
|
||||
absorbstotal:SetTextColor (.8, .8, .8, 1)
|
||||
|
||||
local absorbstotal_amt = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local absorbstotal_amt = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
absorbstotal_amt:SetPoint("left", absorbstotal, "right", 2, 0)
|
||||
absorbstotal_amt:SetText("0")
|
||||
tab.absorbstotal = absorbstotal_amt
|
||||
@@ -2019,11 +2019,11 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
--per second
|
||||
local absorbstotalpersecond = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local absorbstotalpersecond = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
absorbstotalpersecond:SetPoint("topleft", summaryBox, "topleft", 20, y)
|
||||
absorbstotalpersecond:SetText("Per Second:") --localize-me
|
||||
|
||||
local absorbstotalpersecond_amt = summaryBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local absorbstotalpersecond_amt = summaryBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
absorbstotalpersecond_amt:SetPoint("left", absorbstotalpersecond, "right", 2, 0)
|
||||
absorbstotalpersecond_amt:SetText("0")
|
||||
tab.absorbstotalpersecond = absorbstotalpersecond_amt
|
||||
@@ -2038,29 +2038,29 @@ function gump:CriaJanelaInfo()
|
||||
meleeBox:SetPoint("topleft", summaryBox, "bottomleft", 0, -5)
|
||||
meleeBox:SetSize(200, 160)
|
||||
|
||||
local melee_text = meleeBox:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local melee_text = meleeBox:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
melee_text:SetText("Melee")
|
||||
melee_text :SetPoint("topleft", meleeBox, "topleft", 5, y)
|
||||
|
||||
y = y - padding
|
||||
|
||||
--dodge
|
||||
local dodge = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local dodge = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
dodge:SetPoint("topleft", meleeBox, "topleft", 15, y)
|
||||
dodge:SetText("Dodge:") --localize-me
|
||||
dodge:SetTextColor (.8, .8, .8, 1)
|
||||
local dodge_amt = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local dodge_amt = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
dodge_amt:SetPoint("left", dodge, "right", 2, 0)
|
||||
dodge_amt:SetText("0")
|
||||
tab.dodge = dodge_amt
|
||||
|
||||
y = y - padding
|
||||
|
||||
local dodgepersecond = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local dodgepersecond = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
dodgepersecond:SetPoint("topleft", meleeBox, "topleft", 20, y)
|
||||
dodgepersecond:SetText("Per Second:") --localize-me
|
||||
|
||||
local dodgepersecond_amt = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local dodgepersecond_amt = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
dodgepersecond_amt:SetPoint("left", dodgepersecond, "right", 2, 0)
|
||||
dodgepersecond_amt:SetText("0")
|
||||
tab.dodgepersecond = dodgepersecond_amt
|
||||
@@ -2068,21 +2068,21 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
-- parry
|
||||
local parry = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local parry = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
parry:SetPoint("topleft", meleeBox, "topleft", 15, y)
|
||||
parry:SetText("Parry:") --localize-me
|
||||
parry:SetTextColor (.8, .8, .8, 1)
|
||||
local parry_amt = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local parry_amt = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
parry_amt:SetPoint("left", parry, "right", 2, 0)
|
||||
parry_amt:SetText("0")
|
||||
tab.parry = parry_amt
|
||||
|
||||
y = y - padding
|
||||
|
||||
local parrypersecond = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local parrypersecond = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
parrypersecond:SetPoint("topleft", meleeBox, "topleft", 20, y)
|
||||
parrypersecond:SetText("Per Second:") --localize-me
|
||||
local parrypersecond_amt = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local parrypersecond_amt = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
parrypersecond_amt:SetPoint("left", parrypersecond, "right", 2, 0)
|
||||
parrypersecond_amt:SetText("0")
|
||||
tab.parrypersecond = parrypersecond_amt
|
||||
@@ -2090,31 +2090,31 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
-- block
|
||||
local block = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local block = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
block:SetPoint("topleft", meleeBox, "topleft", 15, y)
|
||||
block:SetText("Block:") --localize-me
|
||||
block:SetTextColor (.8, .8, .8, 1)
|
||||
local block_amt = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local block_amt = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
block_amt:SetPoint("left", block, "right", 2, 0)
|
||||
block_amt:SetText("0")
|
||||
tab.block = block_amt
|
||||
|
||||
y = y - padding
|
||||
|
||||
local blockpersecond = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local blockpersecond = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
blockpersecond:SetPoint("topleft", meleeBox, "topleft", 20, y)
|
||||
blockpersecond:SetText("Per Second:") --localize-me
|
||||
local blockpersecond_amt = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local blockpersecond_amt = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
blockpersecond_amt:SetPoint("left", blockpersecond, "right", 2, 0)
|
||||
blockpersecond_amt:SetText("0")
|
||||
tab.blockpersecond = blockpersecond_amt
|
||||
|
||||
y = y - padding
|
||||
|
||||
local blockeddamage = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local blockeddamage = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
blockeddamage:SetPoint("topleft", meleeBox, "topleft", 20, y)
|
||||
blockeddamage:SetText("Damage Blocked:") --localize-me
|
||||
local blockeddamage_amt = meleeBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local blockeddamage_amt = meleeBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
blockeddamage_amt:SetPoint("left", blockeddamage, "right", 2, 0)
|
||||
blockeddamage_amt:SetText("0")
|
||||
tab.blockeddamage_amt = blockeddamage_amt
|
||||
@@ -2129,18 +2129,18 @@ function gump:CriaJanelaInfo()
|
||||
absorbsBox:SetPoint("topleft", summaryBox, "topright", 10, 0)
|
||||
absorbsBox:SetSize(200, 160)
|
||||
|
||||
local absorb_text = absorbsBox:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local absorb_text = absorbsBox:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
absorb_text:SetText("Absorb")
|
||||
absorb_text :SetPoint("topleft", absorbsBox, "topleft", 5, y)
|
||||
|
||||
y = y - padding
|
||||
|
||||
--full absorbs
|
||||
local fullsbsorbed = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local fullsbsorbed = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
fullsbsorbed:SetPoint("topleft", absorbsBox, "topleft", 20, y)
|
||||
fullsbsorbed:SetText("Full Absorbs:") --localize-me
|
||||
fullsbsorbed:SetTextColor (.8, .8, .8, 1)
|
||||
local fullsbsorbed_amt = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local fullsbsorbed_amt = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
fullsbsorbed_amt:SetPoint("left", fullsbsorbed, "right", 2, 0)
|
||||
fullsbsorbed_amt:SetText("0")
|
||||
tab.fullsbsorbed = fullsbsorbed_amt
|
||||
@@ -2148,11 +2148,11 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
--partially absorbs
|
||||
local partiallyabsorbed = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local partiallyabsorbed = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
partiallyabsorbed:SetPoint("topleft", absorbsBox, "topleft", 20, y)
|
||||
partiallyabsorbed:SetText("Partially Absorbed:") --localize-me
|
||||
partiallyabsorbed:SetTextColor (.8, .8, .8, 1)
|
||||
local partiallyabsorbed_amt = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local partiallyabsorbed_amt = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
partiallyabsorbed_amt:SetPoint("left", partiallyabsorbed, "right", 2, 0)
|
||||
partiallyabsorbed_amt:SetText("0")
|
||||
tab.partiallyabsorbed = partiallyabsorbed_amt
|
||||
@@ -2160,10 +2160,10 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
--partially absorbs per second
|
||||
local partiallyabsorbedpersecond = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local partiallyabsorbedpersecond = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
partiallyabsorbedpersecond:SetPoint("topleft", absorbsBox, "topleft", 25, y)
|
||||
partiallyabsorbedpersecond:SetText("Average:") --localize-me
|
||||
local partiallyabsorbedpersecond_amt = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local partiallyabsorbedpersecond_amt = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
partiallyabsorbedpersecond_amt:SetPoint("left", partiallyabsorbedpersecond, "right", 2, 0)
|
||||
partiallyabsorbedpersecond_amt:SetText("0")
|
||||
tab.partiallyabsorbedpersecond = partiallyabsorbedpersecond_amt
|
||||
@@ -2171,11 +2171,11 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
--no absorbs
|
||||
local noabsorbs = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local noabsorbs = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
noabsorbs:SetPoint("topleft", absorbsBox, "topleft", 20, y)
|
||||
noabsorbs:SetText("No Absorption:") --localize-me
|
||||
noabsorbs:SetTextColor (.8, .8, .8, 1)
|
||||
local noabsorbs_amt = absorbsBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local noabsorbs_amt = absorbsBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
noabsorbs_amt:SetPoint("left", noabsorbs, "right", 2, 0)
|
||||
noabsorbs_amt:SetText("0")
|
||||
tab.noabsorbs = noabsorbs_amt
|
||||
@@ -2190,18 +2190,18 @@ function gump:CriaJanelaInfo()
|
||||
healingBox:SetPoint("topleft", absorbsBox, "bottomleft", 0, -5)
|
||||
healingBox:SetSize(200, 160)
|
||||
|
||||
local healing_text = healingBox:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local healing_text = healingBox:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
healing_text:SetText("Healing")
|
||||
healing_text :SetPoint("topleft", healingBox, "topleft", 5, y)
|
||||
|
||||
y = y - padding
|
||||
|
||||
--self healing
|
||||
local selfhealing = healingBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local selfhealing = healingBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
selfhealing:SetPoint("topleft", healingBox, "topleft", 20, y)
|
||||
selfhealing:SetText("Self Healing:") --localize-me
|
||||
selfhealing:SetTextColor (.8, .8, .8, 1)
|
||||
local selfhealing_amt = healingBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local selfhealing_amt = healingBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
selfhealing_amt:SetPoint("left", selfhealing, "right", 2, 0)
|
||||
selfhealing_amt:SetText("0")
|
||||
tab.selfhealing = selfhealing_amt
|
||||
@@ -2209,10 +2209,10 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
--self healing per second
|
||||
local selfhealingpersecond = healingBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local selfhealingpersecond = healingBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
selfhealingpersecond:SetPoint("topleft", healingBox, "topleft", 25, y)
|
||||
selfhealingpersecond:SetText("Per Second:") --localize-me
|
||||
local selfhealingpersecond_amt = healingBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local selfhealingpersecond_amt = healingBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
selfhealingpersecond_amt:SetPoint("left", selfhealingpersecond, "right", 2, 0)
|
||||
selfhealingpersecond_amt:SetText("0")
|
||||
tab.selfhealingpersecond = selfhealingpersecond_amt
|
||||
@@ -2220,11 +2220,11 @@ function gump:CriaJanelaInfo()
|
||||
y = y - padding
|
||||
|
||||
for i = 1, 5 do
|
||||
local healer = healingBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local healer = healingBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
healer:SetPoint("topleft", healingBox, "topleft", 20, y + ((i-1)*15)*-1)
|
||||
healer:SetText("healer name:") --localize-me
|
||||
healer:SetTextColor (.8, .8, .8, 1)
|
||||
local healer_amt = healingBox:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local healer_amt = healingBox:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
healer_amt:SetPoint("left", healer, "right", 2, 0)
|
||||
healer_amt:SetText("0")
|
||||
tab ["healer" .. i] = {healer, healer_amt}
|
||||
@@ -2242,7 +2242,7 @@ function gump:CriaJanelaInfo()
|
||||
spellsBox:SetPoint("topleft", absorbsBox, "topright", 10, 0)
|
||||
spellsBox:SetSize(346, 160 * 2 + 5)
|
||||
|
||||
local spells_text = spellsBox:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local spells_text = spellsBox:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
spells_text:SetText("Spells")
|
||||
spells_text :SetPoint("topleft", spellsBox, "topleft", 5, y)
|
||||
|
||||
@@ -2279,12 +2279,12 @@ function gump:CriaJanelaInfo()
|
||||
icon:SetSize(14, 14)
|
||||
icon:SetPoint("left", frame_tooltip, "left")
|
||||
|
||||
local spell = frame_tooltip:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local spell = frame_tooltip:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
spell:SetPoint("left", icon, "right", 2, 0)
|
||||
spell:SetText("spell name:") --localize-me
|
||||
spell:SetTextColor (.8, .8, .8, 1)
|
||||
|
||||
local spell_amt = frame_tooltip:CreateFontString (nil, "artwork", "GameFontHighlightSmall")
|
||||
local spell_amt = frame_tooltip:CreateFontString(nil, "artwork", "GameFontHighlightSmall")
|
||||
spell_amt:SetPoint("left", spell, "right", 2, 0)
|
||||
spell_amt:SetText("0")
|
||||
|
||||
@@ -2738,10 +2738,10 @@ function gump:CriaJanelaInfo()
|
||||
|
||||
local icon = line:CreateTexture("$parentIcon", "overlay")
|
||||
icon:SetSize(scroll_line_height -2 , scroll_line_height - 2)
|
||||
local name = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local uptime = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local apply = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local refresh = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local name = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
local uptime = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
local apply = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
local refresh = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
|
||||
--local waButton = DF:CreateButton(line, wa_button, 18, 18)
|
||||
--waButton:SetIcon ([[Interface\AddOns\WeakAuras\Media\Textures\icon]])
|
||||
@@ -3020,7 +3020,7 @@ function gump:CriaJanelaInfo()
|
||||
if (player_2) then
|
||||
local player_2_target = player_2.targets
|
||||
player_2_target_pool = {}
|
||||
for target_name, amount in _pairs(player_2_target) do
|
||||
for target_name, amount in pairs(player_2_target) do
|
||||
player_2_target_pool [#player_2_target_pool+1] = {target_name, amount}
|
||||
end
|
||||
table.sort (player_2_target_pool, _detalhes.Sort2)
|
||||
@@ -3039,7 +3039,7 @@ function gump:CriaJanelaInfo()
|
||||
if (player_3) then
|
||||
local player_3_target = player_3.targets
|
||||
player_3_target_pool = {}
|
||||
for target_name, amount in _pairs(player_3_target) do
|
||||
for target_name, amount in pairs(player_3_target) do
|
||||
player_3_target_pool [#player_3_target_pool+1] = {target_name, amount}
|
||||
end
|
||||
table.sort (player_3_target_pool, _detalhes.Sort2)
|
||||
@@ -3253,7 +3253,7 @@ function gump:CriaJanelaInfo()
|
||||
|
||||
--main player skills
|
||||
local spells_sorted = {}
|
||||
for spellid, spelltable in _pairs(player.spells._ActorTable) do
|
||||
for spellid, spelltable in pairs(player.spells._ActorTable) do
|
||||
spells_sorted [#spells_sorted+1] = {spelltable, spelltable.total}
|
||||
end
|
||||
|
||||
@@ -3261,7 +3261,7 @@ function gump:CriaJanelaInfo()
|
||||
for petIndex, petName in ipairs(player:Pets()) do
|
||||
local petActor = info.instancia.showing [player.tipo]:PegarCombatente (nil, petName)
|
||||
if (petActor) then
|
||||
for _spellid, _skill in _pairs(petActor:GetActorSpells()) do
|
||||
for _spellid, _skill in pairs(petActor:GetActorSpells()) do
|
||||
spells_sorted [#spells_sorted+1] = {_skill, _skill.total, petName}
|
||||
end
|
||||
end
|
||||
@@ -3289,14 +3289,14 @@ function gump:CriaJanelaInfo()
|
||||
player_2_spells_sorted = {}
|
||||
|
||||
--player 2 spells
|
||||
for spellid, spelltable in _pairs(other_players [1].spells._ActorTable) do
|
||||
for spellid, spelltable in pairs(other_players [1].spells._ActorTable) do
|
||||
player_2_spells_sorted [#player_2_spells_sorted+1] = {spelltable, spelltable.total}
|
||||
end
|
||||
--player 2 pets
|
||||
for petIndex, petName in ipairs(other_players [1]:Pets()) do
|
||||
local petActor = info.instancia.showing [player.tipo]:PegarCombatente (nil, petName)
|
||||
if (petActor) then
|
||||
for _spellid, _skill in _pairs(petActor:GetActorSpells()) do
|
||||
for _spellid, _skill in pairs(petActor:GetActorSpells()) do
|
||||
player_2_spells_sorted [#player_2_spells_sorted+1] = {_skill, _skill.total, petName}
|
||||
end
|
||||
end
|
||||
@@ -3331,14 +3331,14 @@ function gump:CriaJanelaInfo()
|
||||
|
||||
if (other_players [2]) then
|
||||
--player 3 spells
|
||||
for spellid, spelltable in _pairs(other_players [2].spells._ActorTable) do
|
||||
for spellid, spelltable in pairs(other_players [2].spells._ActorTable) do
|
||||
player_3_spells_sorted [#player_3_spells_sorted+1] = {spelltable, spelltable.total}
|
||||
end
|
||||
--player 3 pets
|
||||
for petIndex, petName in ipairs(other_players [2]:Pets()) do
|
||||
local petActor = info.instancia.showing [player.tipo]:PegarCombatente (nil, petName)
|
||||
if (petActor) then
|
||||
for _spellid, _skill in _pairs(petActor:GetActorSpells()) do
|
||||
for _spellid, _skill in pairs(petActor:GetActorSpells()) do
|
||||
player_3_spells_sorted [#player_3_spells_sorted+1] = {_skill, _skill.total, petName}
|
||||
end
|
||||
end
|
||||
@@ -3594,7 +3594,7 @@ function gump:CriaJanelaInfo()
|
||||
--player 1 targets
|
||||
local my_targets = self.tab.player.targets
|
||||
local target_pool = {}
|
||||
for target_name, amount in _pairs(my_targets) do
|
||||
for target_name, amount in pairs(my_targets) do
|
||||
target_pool [#target_pool+1] = {target_name, amount}
|
||||
end
|
||||
table.sort (target_pool, _detalhes.Sort2)
|
||||
@@ -3668,8 +3668,8 @@ function gump:CriaJanelaInfo()
|
||||
|
||||
-- player 1
|
||||
local player_1_skills = {}
|
||||
for spellid, spell in _pairs(player_1.spells._ActorTable) do
|
||||
for name, amount in _pairs(spell.targets) do
|
||||
for spellid, spell in pairs(player_1.spells._ActorTable) do
|
||||
for name, amount in pairs(spell.targets) do
|
||||
if (name == target_name) then
|
||||
player_1_skills [#player_1_skills+1] = {spellid, amount}
|
||||
end
|
||||
@@ -3684,8 +3684,8 @@ function gump:CriaJanelaInfo()
|
||||
local player_2_skills = {}
|
||||
local player_2_top
|
||||
if (player_2) then
|
||||
for spellid, spell in _pairs(player_2.spells._ActorTable) do
|
||||
for name, amount in _pairs(spell.targets) do
|
||||
for spellid, spell in pairs(player_2.spells._ActorTable) do
|
||||
for name, amount in pairs(spell.targets) do
|
||||
if (name == target_name) then
|
||||
player_2_skills [#player_2_skills+1] = {spellid, amount}
|
||||
end
|
||||
@@ -3700,8 +3700,8 @@ function gump:CriaJanelaInfo()
|
||||
local player_3_skills = {}
|
||||
local player_3_top
|
||||
if (player_3) then
|
||||
for spellid, spell in _pairs(player_3.spells._ActorTable) do
|
||||
for name, amount in _pairs(spell.targets) do
|
||||
for spellid, spell in pairs(player_3.spells._ActorTable) do
|
||||
for name, amount in pairs(spell.targets) do
|
||||
if (name == target_name) then
|
||||
player_3_skills [#player_3_skills+1] = {spellid, amount}
|
||||
end
|
||||
@@ -3969,7 +3969,7 @@ function gump:CriaJanelaInfo()
|
||||
else
|
||||
local spellname = GetSpellInfo(spellid)
|
||||
local extra_search_found
|
||||
for casted_spellid, amount in _pairs(player1_misc.spell_cast or {}) do
|
||||
for casted_spellid, amount in pairs(player1_misc.spell_cast or {}) do
|
||||
local casted_spellname = GetSpellInfo(casted_spellid)
|
||||
if (casted_spellname == spellname) then
|
||||
frame1.tooltip.casts_label3:SetText(amount)
|
||||
@@ -4133,7 +4133,7 @@ function gump:CriaJanelaInfo()
|
||||
local amt_casts = player2_misc.spell_cast and player2_misc.spell_cast [spellid]
|
||||
if (not amt_casts) then
|
||||
local spellname = GetSpellInfo(spellid)
|
||||
for casted_spellid, amount in _pairs(player2_misc.spell_cast or {}) do
|
||||
for casted_spellid, amount in pairs(player2_misc.spell_cast or {}) do
|
||||
local casted_spellname = GetSpellInfo(casted_spellid)
|
||||
if (casted_spellname == spellname) then
|
||||
amt_casts = amount
|
||||
@@ -4310,7 +4310,7 @@ function gump:CriaJanelaInfo()
|
||||
local amt_casts = player3_misc.spell_cast and player3_misc.spell_cast [spellid]
|
||||
if (not amt_casts) then
|
||||
local spellname = GetSpellInfo(spellid)
|
||||
for casted_spellid, amount in _pairs(player3_misc.spell_cast or {}) do
|
||||
for casted_spellid, amount in pairs(player3_misc.spell_cast or {}) do
|
||||
local casted_spellname = GetSpellInfo(casted_spellid)
|
||||
if (casted_spellname == spellname) then
|
||||
amt_casts = amount
|
||||
@@ -4418,7 +4418,7 @@ function gump:CriaJanelaInfo()
|
||||
bar:SetScript("OnLeave", on_leave)
|
||||
end
|
||||
|
||||
bar.lefttext = bar:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
bar.lefttext = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
|
||||
local _, size, flags = bar.lefttext:GetFont()
|
||||
local font = SharedMedia:Fetch ("font", "Arial Narrow")
|
||||
@@ -4435,7 +4435,7 @@ function gump:CriaJanelaInfo()
|
||||
bar.lefttext:SetWidth(110)
|
||||
end
|
||||
|
||||
bar.righttext = bar:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
bar.righttext = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
|
||||
local _, size, flags = bar.righttext:GetFont()
|
||||
local font = SharedMedia:Fetch ("font", "Arial Narrow")
|
||||
@@ -4445,7 +4445,7 @@ function gump:CriaJanelaInfo()
|
||||
bar.righttext:SetJustifyH("right")
|
||||
bar.righttext:SetTextColor (1, 1, 1, 1)
|
||||
|
||||
bar.righttext2 = bar:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
bar.righttext2 = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
|
||||
local _, size, flags = bar.righttext2:GetFont()
|
||||
local font = SharedMedia:Fetch ("font", "Arial Narrow")
|
||||
@@ -4479,67 +4479,67 @@ function gump:CriaJanelaInfo()
|
||||
background:SetPoint("topleft", tooltip, "topleft", 0, 0)
|
||||
background:SetPoint("bottomright", tooltip, "bottomright", 0, 0)
|
||||
|
||||
tooltip.casts_label = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.casts_label = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.casts_label:SetPoint("topleft", tooltip, "topleft", x_start, -2 + (y*0))
|
||||
tooltip.casts_label:SetText("Total Casts:")
|
||||
tooltip.casts_label:SetJustifyH("left")
|
||||
tooltip.casts_label2 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.casts_label2 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.casts_label2:SetPoint("topright", tooltip, "topright", -x_start, -2 + (y*0))
|
||||
tooltip.casts_label2:SetText("0")
|
||||
tooltip.casts_label2:SetJustifyH("right")
|
||||
tooltip.casts_label3 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.casts_label3 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.casts_label3:SetPoint("topright", tooltip, "topright", -x_start - 46, -2 + (y*0))
|
||||
tooltip.casts_label3:SetText("0")
|
||||
tooltip.casts_label3:SetJustifyH("right")
|
||||
|
||||
tooltip.hits_label = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.hits_label = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.hits_label:SetPoint("topleft", tooltip, "topleft", x_start, -14 + (y*1))
|
||||
tooltip.hits_label:SetText("Total Hits:")
|
||||
tooltip.hits_label:SetJustifyH("left")
|
||||
tooltip.hits_label2 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.hits_label2 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.hits_label2:SetPoint("topright", tooltip, "topright", -x_start, -14 + (y*1))
|
||||
tooltip.hits_label2:SetText("0")
|
||||
tooltip.hits_label2:SetJustifyH("right")
|
||||
tooltip.hits_label3 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.hits_label3 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.hits_label3:SetPoint("topright", tooltip, "topright", -x_start - 46, -14 + (y*1))
|
||||
tooltip.hits_label3:SetText("0")
|
||||
tooltip.hits_label3:SetJustifyH("right")
|
||||
|
||||
tooltip.average_label = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.average_label = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.average_label:SetPoint("topleft", tooltip, "topleft", x_start, -26 + (y*2))
|
||||
tooltip.average_label:SetText("Average:")
|
||||
tooltip.average_label:SetJustifyH("left")
|
||||
tooltip.average_label2 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.average_label2 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.average_label2:SetPoint("topright", tooltip, "topright", -x_start, -26 + (y*2))
|
||||
tooltip.average_label2:SetText("0")
|
||||
tooltip.average_label2:SetJustifyH("right")
|
||||
tooltip.average_label3 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.average_label3 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.average_label3:SetPoint("topright", tooltip, "topright", -x_start - 46, -26 + (y*2))
|
||||
tooltip.average_label3:SetText("0")
|
||||
tooltip.average_label3:SetJustifyH("right")
|
||||
|
||||
tooltip.crit_label = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.crit_label = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.crit_label:SetPoint("topleft", tooltip, "topleft", x_start, -38 + (y*3))
|
||||
tooltip.crit_label:SetText("Critical:")
|
||||
tooltip.crit_label:SetJustifyH("left")
|
||||
tooltip.crit_label2 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.crit_label2 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.crit_label2:SetPoint("topright", tooltip, "topright", -x_start, -38 + (y*3))
|
||||
tooltip.crit_label2:SetText("0")
|
||||
tooltip.crit_label2:SetJustifyH("right")
|
||||
tooltip.crit_label3 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.crit_label3 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.crit_label3:SetPoint("topright", tooltip, "topright", -x_start - 46, -38 + (y*3))
|
||||
tooltip.crit_label3:SetText("0")
|
||||
tooltip.crit_label3:SetJustifyH("right")
|
||||
|
||||
tooltip.uptime_label = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.uptime_label = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.uptime_label:SetPoint("topleft", tooltip, "topleft", x_start, -50 + (y*4))
|
||||
tooltip.uptime_label:SetText("Uptime:")
|
||||
tooltip.uptime_label:SetJustifyH("left")
|
||||
tooltip.uptime_label2 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.uptime_label2 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.uptime_label2:SetPoint("topright", tooltip, "topright", -x_start, -50 + (y*4))
|
||||
tooltip.uptime_label2:SetText("0")
|
||||
tooltip.uptime_label2:SetJustifyH("right")
|
||||
tooltip.uptime_label3 = tooltip:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.uptime_label3 = tooltip:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
tooltip.uptime_label3:SetPoint("topright", tooltip, "topright", -x_start - 46, -50 + (y*4))
|
||||
tooltip.uptime_label3:SetText("0")
|
||||
tooltip.uptime_label3:SetJustifyH("right")
|
||||
@@ -4617,7 +4617,7 @@ function gump:CriaJanelaInfo()
|
||||
bar:SetHeight(14)
|
||||
bar.icon = spellicon
|
||||
|
||||
bar.lefttext = bar:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
bar.lefttext = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
local _, size, flags = bar.lefttext:GetFont()
|
||||
local font = SharedMedia:Fetch ("font", "Arial Narrow")
|
||||
bar.lefttext:SetFont (font, 11)
|
||||
@@ -4633,7 +4633,7 @@ function gump:CriaJanelaInfo()
|
||||
bar.lefttext:SetWidth(80)
|
||||
end
|
||||
|
||||
bar.righttext = bar:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
bar.righttext = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
local _, size, flags = bar.righttext:GetFont()
|
||||
local font = SharedMedia:Fetch ("font", "Arial Narrow")
|
||||
bar.righttext:SetFont (font, 11)
|
||||
@@ -4641,7 +4641,7 @@ function gump:CriaJanelaInfo()
|
||||
bar.righttext:SetJustifyH("right")
|
||||
bar.righttext:SetTextColor (1, 1, 1, 1)
|
||||
|
||||
bar.righttext2 = bar:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
bar.righttext2 = bar:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
local _, size, flags = bar.righttext2:GetFont()
|
||||
local font = SharedMedia:Fetch ("font", "Arial Narrow")
|
||||
bar.righttext2:SetFont (font, 11)
|
||||
@@ -4693,7 +4693,7 @@ function gump:CriaJanelaInfo()
|
||||
frame1.tooltip = create_tooltip ("DetailsPlayerComparisonBox1Tooltip")
|
||||
frame1.tooltip:SetWidth(spell_compare_frame_width[1])
|
||||
|
||||
local playername1 = frame1:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local playername1 = frame1:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
playername1:SetPoint("bottomleft", frame1, "topleft", 2, 0)
|
||||
playername1:SetText("Player 1")
|
||||
frame1.name_label = playername1
|
||||
@@ -4745,17 +4745,17 @@ function gump:CriaJanelaInfo()
|
||||
frame2.tooltip = create_tooltip ("DetailsPlayerComparisonBox2Tooltip")
|
||||
frame2.tooltip:SetWidth(spell_compare_frame_width[2])
|
||||
|
||||
local playername2 = frame2:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local playername2 = frame2:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
playername2:SetPoint("bottomleft", frame2, "topleft", 2, 0)
|
||||
playername2:SetText("Player 2")
|
||||
frame2.name_label = playername2
|
||||
|
||||
local playername2_percent = frame2:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local playername2_percent = frame2:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
playername2_percent:SetPoint("bottomright", frame2, "topright", -2, 0)
|
||||
playername2_percent:SetText("Player 1 %")
|
||||
playername2_percent:SetTextColor (.6, .6, .6)
|
||||
|
||||
local noPLayersToShow = frame2:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local noPLayersToShow = frame2:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
noPLayersToShow:SetPoint("center")
|
||||
noPLayersToShow:SetText("There's no more players to compare (with the same class/spec)")
|
||||
noPLayersToShow:SetSize(spell_compare_frame_width[2] - 10, spell_compare_frame_height)
|
||||
@@ -4807,19 +4807,19 @@ function gump:CriaJanelaInfo()
|
||||
frame3.tooltip = create_tooltip ("DetailsPlayerComparisonBox3Tooltip")
|
||||
frame3.tooltip:SetWidth(spell_compare_frame_width[3])
|
||||
|
||||
local playername3 = frame3:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local playername3 = frame3:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
playername3:SetPoint("bottomleft", frame3, "topleft", 2, 0)
|
||||
playername3:SetText("Player 3")
|
||||
frame3.name_label = playername3
|
||||
|
||||
local playername3_percent = frame3:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local playername3_percent = frame3:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
playername3_percent:SetPoint("bottomright", frame3, "topright", -2, 0)
|
||||
playername3_percent:SetText("Player 1 %")
|
||||
playername3_percent:SetTextColor (.6, .6, .6)
|
||||
frame3.name_label_percent = playername3_percent
|
||||
|
||||
|
||||
local noPLayersToShow = frame3:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local noPLayersToShow = frame3:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
noPLayersToShow:SetPoint("center")
|
||||
noPLayersToShow:SetText("There's no more players to compare (with the same class/spec)")
|
||||
noPLayersToShow:SetSize(spell_compare_frame_width[2] - 10, spell_compare_frame_height)
|
||||
@@ -4877,7 +4877,7 @@ function gump:CriaJanelaInfo()
|
||||
local my_spells = {}
|
||||
local my_spells_total = 0
|
||||
--build my spell list
|
||||
for spellid, _ in _pairs(playerObject.spells._ActorTable) do
|
||||
for spellid, _ in pairs(playerObject.spells._ActorTable) do
|
||||
my_spells [spellid] = true
|
||||
my_spells_total = my_spells_total + 1
|
||||
end
|
||||
@@ -4894,7 +4894,7 @@ function gump:CriaJanelaInfo()
|
||||
if (actor.classe == class and actor ~= playerObject) then
|
||||
|
||||
local same_spells = 0
|
||||
for spellid, _ in _pairs(actor.spells._ActorTable) do
|
||||
for spellid, _ in pairs(actor.spells._ActorTable) do
|
||||
if (my_spells [spellid]) then
|
||||
same_spells = same_spells + 1
|
||||
end
|
||||
@@ -5513,7 +5513,7 @@ local row_on_mousedown = function(self, button)
|
||||
return
|
||||
end
|
||||
|
||||
self.mouse_down = _GetTime()
|
||||
self.mouse_down = GetTime()
|
||||
local x, y = _GetCursorPosition()
|
||||
self.x = _math_floor(x)
|
||||
self.y = _math_floor(y)
|
||||
@@ -5540,7 +5540,7 @@ local row_on_mouseup = function(self, button)
|
||||
local x, y = _GetCursorPosition()
|
||||
x = _math_floor(x)
|
||||
y = _math_floor(y)
|
||||
if ((self.mouse_down+0.4 > _GetTime() and (x == self.x and y == self.y)) or (x == self.x and y == self.y)) then
|
||||
if ((self.mouse_down+0.4 > GetTime() and (x == self.x and y == self.y)) or (x == self.x and y == self.y)) then
|
||||
--setar os textos
|
||||
|
||||
if (self.isMain) then --se n�o for uma barra de alvo
|
||||
@@ -5688,7 +5688,7 @@ local target_on_enter = function(self)
|
||||
end
|
||||
|
||||
--add and sort
|
||||
for target_name, amount in _pairs(ActorTargetsContainer) do
|
||||
for target_name, amount in pairs(ActorTargetsContainer) do
|
||||
--print(target_name, amount)
|
||||
ActorTargetsSortTable [#ActorTargetsSortTable+1] = {target_name, amount or 0}
|
||||
total = total + (amount or 0)
|
||||
|
||||
@@ -34,11 +34,11 @@ function Details:OpenProfiler()
|
||||
logo:SetPoint("center", f, "center", 0, 0)
|
||||
logo:SetPoint("top", f, "top", 20, 20)
|
||||
|
||||
local string_profiler = f:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local string_profiler = f:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
string_profiler:SetPoint("top", logo, "bottom", -20, 10)
|
||||
string_profiler:SetText("Profiler!")
|
||||
|
||||
local string_profiler = f:CreateFontString (nil, "artwork", "GameFontNormal")
|
||||
local string_profiler = f:CreateFontString(nil, "artwork", "GameFontNormal")
|
||||
string_profiler:SetPoint("topleft", f, "topleft", 10, -130)
|
||||
string_profiler:SetText(L["STRING_OPTIONS_PROFILE_SELECTEXISTING"])
|
||||
string_profiler:SetWidth(230)
|
||||
|
||||
@@ -81,7 +81,7 @@ function Details.OpenRunCodeWindow()
|
||||
local script = code_editor:GetText()
|
||||
local func, errortext = loadstring (script, "Q")
|
||||
if (not func) then
|
||||
local firstLine = strsplit ("\n", script, 2)
|
||||
local firstLine = strsplit("\n", script, 2)
|
||||
errortext = errortext:gsub (firstLine, "")
|
||||
errortext = errortext:gsub ("%[string \"", "")
|
||||
errortext = errortext:gsub ("...\"]:", "")
|
||||
|
||||
@@ -189,7 +189,7 @@ function Details:OpenRaidHistoryWindow (_raid, _boss, _difficulty, _role, _guild
|
||||
local rotation = DF:CreateAnimation(animationHub, "ROTATION", 1, 3, -360)
|
||||
rotation:SetTarget (f.SyncTextureCircle)
|
||||
|
||||
f.SyncText = workingFrame:CreateFontString (nil, "border", "GameFontNormal")
|
||||
f.SyncText = workingFrame:CreateFontString(nil, "border", "GameFontNormal")
|
||||
f.SyncText:SetPoint("right", f.SyncTextureBackground, "left", 0, 0)
|
||||
f.SyncText:SetText("working")
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@ do
|
||||
texture_highlight_frame.texture = button.texture
|
||||
texture_highlight_frame.MainFrame = button
|
||||
|
||||
button.text = button:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
button.text = button:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
button.text:SetPoint("left", button.texture, "right", 2, 0)
|
||||
button.attribute = attribute
|
||||
button.sub_attribute = sub_attribute
|
||||
@@ -225,7 +225,7 @@ do
|
||||
title_icon:SetTexture(texture)
|
||||
title_icon:SetTexCoord (l, r, t, b)
|
||||
title_icon:SetSize(18, 18)
|
||||
local title_str = allDisplaysFrame:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local title_str = allDisplaysFrame:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
title_str:SetPoint("left", title_icon, "right", 2, 0)
|
||||
title_str:SetText(loc_attribute_name)
|
||||
|
||||
@@ -266,7 +266,7 @@ do
|
||||
title_icon:SetTexCoord(412/512, 441/512, 43/512, 79/512)
|
||||
title_icon:SetVertexColor(.7, .6, .5, 1)
|
||||
title_icon:SetSize(16, 16)
|
||||
local title_str = allDisplaysFrame:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local title_str = allDisplaysFrame:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
title_str:SetPoint("left", title_icon, "right", 2, 0)
|
||||
title_str:SetText("Scripts")
|
||||
|
||||
|
||||
@@ -2039,7 +2039,7 @@ function _detalhes:OpenAuraPanel (spellid, spellname, spellicon, encounterid, tr
|
||||
f.Close:SetScript("OnClick", function() f:Hide() end)
|
||||
|
||||
--title
|
||||
f.Title = f.TitleBar:CreateFontString ("$parentTitle", "overlay", "GameFontNormal")
|
||||
f.Title = f.TitleBar:CreateFontString("$parentTitle", "overlay", "GameFontNormal")
|
||||
f.Title:SetPoint("center", f.TitleBar, "center")
|
||||
f.Title:SetText("Details! Create Aura")
|
||||
|
||||
|
||||
+31
-31
@@ -65,7 +65,7 @@ function _detalhes:OpenWelcomeWindow()
|
||||
cancel:GetNormalTexture():SetDesaturated(true)
|
||||
cancel:Disable()
|
||||
|
||||
local cancelText = cancel:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local cancelText = cancel:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
cancelText:SetTextColor (1, 1, 1)
|
||||
cancelText:SetPoint("left", cancel, "right", 2, 0)
|
||||
cancelText:SetText(Loc ["STRING_WELCOME_69"])
|
||||
@@ -243,7 +243,7 @@ local window_openned_at = time()
|
||||
angel:SetHeight(256)
|
||||
angel:SetAlpha(.2)
|
||||
|
||||
local texto1 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto1 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto1:SetPoint("topleft", window, "topleft", 13, -220)
|
||||
texto1:SetText(Loc ["STRING_WELCOME_1"])
|
||||
texto1:SetJustifyH("left")
|
||||
@@ -265,11 +265,11 @@ local window_openned_at = time()
|
||||
bg55:SetAlpha(.05)
|
||||
bg55:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto55 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto55 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto55:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto55:SetText(Loc ["STRING_WELCOME_42"])
|
||||
|
||||
local texto555 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto555 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto555:SetText(Loc ["STRING_WELCOME_45"])
|
||||
texto555:SetTextColor (1, 1, 1, 1)
|
||||
|
||||
@@ -278,7 +278,7 @@ local window_openned_at = time()
|
||||
window.changemind55Label:SetPoint("bottom", window, "bottom", 0, 19)
|
||||
window.changemind55Label.align = "|"
|
||||
|
||||
local texto_appearance = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_appearance = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_appearance:SetPoint("topleft", window, "topleft", 30, -110)
|
||||
texto_appearance:SetText(Loc ["STRING_WELCOME_43"])
|
||||
texto_appearance:SetWidth(460)
|
||||
@@ -329,7 +329,7 @@ local window_openned_at = time()
|
||||
|
||||
--alphabet selection
|
||||
|
||||
local texto_alphabet = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_alphabet = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_alphabet:SetPoint("topleft", window, "topleft", 30, -110)
|
||||
texto_alphabet:SetText(Loc ["STRING_WELCOME_73"]) --"Select the Alphabet or Region:"
|
||||
texto_alphabet:SetJustifyH("left")
|
||||
@@ -704,7 +704,7 @@ local window_openned_at = time()
|
||||
window.changemindNumeralLabel:SetPoint("bottom", window, "bottom", 0, 19)
|
||||
window.changemindNumeralLabel.align = "|"
|
||||
|
||||
local texto2Numeral = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto2Numeral = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto2Numeral:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto2Numeral:SetText(Loc ["STRING_NUMERALSYSTEM_DESC"] .. ":")
|
||||
|
||||
@@ -757,7 +757,7 @@ local window_openned_at = time()
|
||||
thedude2:SetTexCoord (0, 1, 0, 1)
|
||||
thedude2:SetDrawLayer ("overlay", 3)
|
||||
|
||||
local NumeralType1_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local NumeralType1_text = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
NumeralType1_text:SetText("1K = 1.000 |cFFFFCC00| |r10K = 10.000 |cFFFFCC00| |r100K = 100.000 |cFFFFCC00| |r1M = 1.000.000")
|
||||
NumeralType1_text:SetWidth(500)
|
||||
NumeralType1_text:SetHeight(40)
|
||||
@@ -766,7 +766,7 @@ local window_openned_at = time()
|
||||
NumeralType1_text:SetTextColor (.8, .8, .8, 1)
|
||||
NumeralType1_text:SetPoint("topleft", window, "topleft", 40, -150)
|
||||
|
||||
local NumeralType2_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local NumeralType2_text = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
|
||||
|
||||
local asian1K, asian10K, asian1B = _detalhes.gump:GetAsianNumberSymbols()
|
||||
@@ -823,7 +823,7 @@ local window_openned_at = time()
|
||||
window.changemind2Label:SetPoint("bottom", window, "bottom", 0, 19)
|
||||
window.changemind2Label.align = "|"
|
||||
|
||||
local texto2 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto2 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto2:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto2:SetText(Loc ["STRING_WELCOME_3"])
|
||||
|
||||
@@ -876,7 +876,7 @@ local window_openned_at = time()
|
||||
thedude:SetTexCoord (0, 1, 0, 1)
|
||||
thedude:SetDrawLayer ("overlay", 3)
|
||||
|
||||
local chronometer_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local chronometer_text = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
chronometer_text:SetText(Loc ["STRING_WELCOME_6"])
|
||||
chronometer_text:SetWidth(360)
|
||||
chronometer_text:SetHeight(40)
|
||||
@@ -885,7 +885,7 @@ local window_openned_at = time()
|
||||
chronometer_text:SetTextColor (.8, .8, .8, 1)
|
||||
chronometer_text:SetPoint("topleft", window.ChronometerLabel.widget, "topright", 20, 0)
|
||||
|
||||
local continuous_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local continuous_text = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
continuous_text:SetText(Loc ["STRING_WELCOME_7"])
|
||||
continuous_text:SetWidth(340)
|
||||
continuous_text:SetHeight(40)
|
||||
@@ -902,7 +902,7 @@ local window_openned_at = time()
|
||||
continuous:SetValue(true)
|
||||
end
|
||||
|
||||
local pleasewait = window:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local pleasewait = window:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
pleasewait:SetPoint("bottomright", forward, "topright")
|
||||
|
||||
local free_frame3 = CreateFrame("frame", nil, window)
|
||||
@@ -963,11 +963,11 @@ local window_openned_at = time()
|
||||
window.changemind4Label:SetPoint("bottom", window, "bottom", 0, 19)
|
||||
window.changemind4Label.align = "|"
|
||||
|
||||
local texto4 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto4 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto4:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto4:SetText(Loc ["STRING_WELCOME_41"])
|
||||
|
||||
local interval_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local interval_text = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
interval_text:SetText(Loc ["STRING_WELCOME_12"])
|
||||
interval_text:SetWidth(460)
|
||||
interval_text:SetHeight(40)
|
||||
@@ -976,7 +976,7 @@ local window_openned_at = time()
|
||||
interval_text:SetTextColor (1, 1, 1, .9)
|
||||
interval_text:SetPoint("topleft", window, "topleft", 30, -110)
|
||||
|
||||
local dance_text = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local dance_text = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
dance_text:SetText("") --loc removed
|
||||
dance_text:SetWidth(460)
|
||||
dance_text:SetHeight(40)
|
||||
@@ -1125,11 +1125,11 @@ local window_openned_at = time()
|
||||
bg6:SetAlpha(.1)
|
||||
bg6:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto5 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto5 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto5:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto5:SetText(Loc ["STRING_WELCOME_26"])
|
||||
|
||||
local texto_stretch = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_stretch = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_stretch:SetPoint("topleft", window, "topleft", 181, -105)
|
||||
texto_stretch:SetText(Loc ["STRING_WELCOME_27"])
|
||||
texto_stretch:SetWidth(310)
|
||||
@@ -1183,11 +1183,11 @@ local window_openned_at = time()
|
||||
bg6:SetAlpha(.1)
|
||||
bg6:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto6 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto6 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto6:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto6:SetText(Loc ["STRING_WELCOME_28"])
|
||||
|
||||
local texto_instance_button = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_instance_button = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_instance_button:SetPoint("topleft", window, "topleft", 25, -105)
|
||||
texto_instance_button:SetText(Loc ["STRING_WELCOME_29"])
|
||||
texto_instance_button:SetWidth(270)
|
||||
@@ -1239,11 +1239,11 @@ local window_openned_at = time()
|
||||
bg7:SetAlpha(.1)
|
||||
bg7:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto7 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto7 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto7:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto7:SetText(Loc ["STRING_WELCOME_30"])
|
||||
|
||||
local texto_shortcut = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_shortcut = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_shortcut:SetPoint("topleft", window, "topleft", 25, -105)
|
||||
texto_shortcut:SetText(Loc ["STRING_WELCOME_31"])
|
||||
texto_shortcut:SetWidth(290)
|
||||
@@ -1274,7 +1274,7 @@ local window_openned_at = time()
|
||||
local desc_anchor_bottomleft = _detalhes.gump:NewImage (bookmark_frame, [[Interface\AddOns\Details\images\options_window]], 75, 106, "artwork", {0.2724609375, 0.19921875, 0.783203125, 0.6796875}, "descAnchorTopLeftImage", "$parentDescAnchorTopLeftImage") --204 696 279 802
|
||||
desc_anchor_bottomleft:SetPoint("bottomright", bookmark_frame, "bottomright", 5, -5)
|
||||
|
||||
local bmf_string = bookmark_frame:CreateFontString ("overlay", nil, "GameFontNormal")
|
||||
local bmf_string = bookmark_frame:CreateFontString("overlay", nil, "GameFontNormal")
|
||||
bmf_string:SetPoint("center", bookmark_frame, "center")
|
||||
bmf_string:SetText(Loc ["STRING_WELCOME_65"])
|
||||
|
||||
@@ -1308,11 +1308,11 @@ local window_openned_at = time()
|
||||
bg77:SetAlpha(.1)
|
||||
bg77:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto77 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto77 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto77:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto77:SetText(Loc ["STRING_WELCOME_32"])
|
||||
|
||||
local texto_snap = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_snap = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_snap:SetPoint("topleft", window, "topleft", 25, -101)
|
||||
texto_snap:SetText(Loc ["STRING_WELCOME_66"])
|
||||
texto_snap:SetWidth(160)
|
||||
@@ -1354,11 +1354,11 @@ local window_openned_at = time()
|
||||
bg88:SetAlpha(.1)
|
||||
bg88:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto88 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto88 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto88:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto88:SetText(Loc ["STRING_WELCOME_34"])
|
||||
|
||||
local texto_micro_display = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_micro_display = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_micro_display:SetPoint("topleft", window, "topleft", 25, -101)
|
||||
texto_micro_display:SetText(Loc ["STRING_WELCOME_67"])
|
||||
texto_micro_display:SetWidth(300)
|
||||
@@ -1477,11 +1477,11 @@ local window_openned_at = time()
|
||||
bg11:SetAlpha(.1)
|
||||
bg11:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto11 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto11 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto11:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto11:SetText(Loc ["STRING_WELCOME_36"])
|
||||
|
||||
local texto_plugins = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto_plugins = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto_plugins:SetPoint("topleft", window, "topleft", 25, -101)
|
||||
texto_plugins:SetText(Loc ["STRING_WELCOME_68"])
|
||||
texto_plugins:SetWidth(220)
|
||||
@@ -1516,11 +1516,11 @@ local window_openned_at = time()
|
||||
bg8:SetAlpha(.1)
|
||||
bg8:SetTexCoord (1, 0, 0, 1)
|
||||
|
||||
local texto8 = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto8 = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto8:SetPoint("topleft", window, "topleft", 20, -80)
|
||||
texto8:SetText(Loc ["STRING_WELCOME_38"])
|
||||
|
||||
local texto = window:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local texto = window:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
texto:SetPoint("topleft", window, "topleft", 25, -110)
|
||||
texto:SetText(Loc ["STRING_WELCOME_39"])
|
||||
texto:SetWidth(410)
|
||||
|
||||
+7
-7
@@ -20,7 +20,7 @@
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
--local pointers
|
||||
|
||||
local _pairs = pairs --lua local
|
||||
local pairs = pairs --lua local
|
||||
local ipairs = ipairs --lua local
|
||||
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -29,14 +29,14 @@
|
||||
--return if the buff is already registred or not
|
||||
function _detalhes.Buffs:IsRegistred (buff)
|
||||
if (type(buff) == "number") then
|
||||
for _, buffObject in _pairs(_detalhes.Buffs.BuffsTable) do
|
||||
for _, buffObject in pairs(_detalhes.Buffs.BuffsTable) do
|
||||
if (buffObject.id == buff) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
elseif (type(buff) == "string") then
|
||||
for name, _ in _pairs(_detalhes.Buffs.BuffsTable) do
|
||||
for name, _ in pairs(_detalhes.Buffs.BuffsTable) do
|
||||
if (name == buff) then
|
||||
return true
|
||||
end
|
||||
@@ -70,7 +70,7 @@
|
||||
--return a list of registred buffs
|
||||
function _detalhes.Buffs:GetBuffList()
|
||||
local list = {}
|
||||
for name, _ in _pairs(_detalhes.Buffs.BuffsTable) do
|
||||
for name, _ in pairs(_detalhes.Buffs.BuffsTable) do
|
||||
list [#list+1] = name
|
||||
end
|
||||
return list
|
||||
@@ -79,7 +79,7 @@
|
||||
--return a list of registred buffs ids
|
||||
function _detalhes.Buffs:GetBuffListIds()
|
||||
local list = {}
|
||||
for name, buffObject in _pairs(_detalhes.Buffs.BuffsTable) do
|
||||
for name, buffObject in pairs(_detalhes.Buffs.BuffsTable) do
|
||||
list [#list+1] = buffObject.id
|
||||
end
|
||||
return list
|
||||
@@ -153,7 +153,7 @@
|
||||
_detalhes.Buffs:BuildTables()
|
||||
end
|
||||
|
||||
for _, BuffTable in _pairs(_detalhes.Buffs.BuffsTable) do
|
||||
for _, BuffTable in pairs(_detalhes.Buffs.BuffsTable) do
|
||||
if (BuffTable.active) then
|
||||
BuffTable.start = _detalhes._tempo
|
||||
BuffTable.castedAmt = 1
|
||||
@@ -180,7 +180,7 @@
|
||||
end
|
||||
|
||||
--[[
|
||||
for index, BuffName in _pairs(_detalhes.SoloTables.BuffsTableNameCache) do
|
||||
for index, BuffName in pairs(_detalhes.SoloTables.BuffsTableNameCache) do
|
||||
if (BuffName == name) then
|
||||
local BuffObject = _detalhes.SoloTables.SoloBuffUptime [name]
|
||||
if (not BuffObject) then
|
||||
|
||||
@@ -238,7 +238,7 @@ function detailsOnDeathMenu.CanShowPanel()
|
||||
if (isInInstance) then
|
||||
--check if all players in the raid are out of combat
|
||||
for i = 1, GetNumGroupMembers() do
|
||||
if (UnitAffectingCombat ("raid" .. i)) then
|
||||
if (UnitAffectingCombat("raid" .. i)) then
|
||||
C_Timer.After(0.5, detailsOnDeathMenu.ShowPanel)
|
||||
return false
|
||||
end
|
||||
|
||||
@@ -38,16 +38,16 @@ local create_deathrecap_line = function(parent, n)
|
||||
|
||||
line:SetSize(300, 21)
|
||||
|
||||
local timeAt = line:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local timeAt = line:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
local backgroundTexture = line:CreateTexture(nil, "border")
|
||||
local backgroundTextureOverlay = line:CreateTexture(nil, "artwork")
|
||||
local spellIcon = line:CreateTexture(nil, "overlay")
|
||||
local spellIconBorder = line:CreateTexture(nil, "overlay")
|
||||
spellIcon:SetDrawLayer ("overlay", 1)
|
||||
spellIconBorder:SetDrawLayer ("overlay", 2)
|
||||
local sourceName = line:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local amount = line:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local lifePercent = line:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local sourceName = line:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
local amount = line:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
local lifePercent = line:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
local lifeStatusBar = line:CreateTexture(nil, "border", nil, -3)
|
||||
|
||||
--grave icon
|
||||
@@ -274,7 +274,7 @@ function Details.OpenDetailsDeathRecap (segment, RecapID, fromChat)
|
||||
segmentButton:SetSize(16, 20)
|
||||
segmentButton:SetPoint("topright", DeathRecapFrame, "topright", (-abs(i-6) * 22) - 10, -5)
|
||||
|
||||
local text = segmentButton:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local text = segmentButton:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
segmentButton.text = text
|
||||
text:SetText("#" .. i)
|
||||
text:SetPoint("center")
|
||||
|
||||
@@ -434,7 +434,7 @@ function DetailsMythicPlusFrame.BossDefeated (this_is_end_end, encounterID, enco
|
||||
DetailsMythicPlusFrame.TrashMergeScheduled = segmentsToMerge
|
||||
|
||||
--there's no more script run too long
|
||||
--if (not InCombatLockdown() and not UnitAffectingCombat ("player")) then
|
||||
--if (not InCombatLockdown() and not UnitAffectingCombat("player")) then
|
||||
if (DetailsMythicPlusFrame.DevelopmentDebug) then
|
||||
print("Details!", "BossDefeated() > not in combat, merging trash now")
|
||||
end
|
||||
@@ -560,7 +560,7 @@ function DetailsMythicPlusFrame.MythicDungeonFinished (fromZoneLeft)
|
||||
DetailsMythicPlusFrame.TrashMergeScheduled2_OverallCombat = latestTrashOverall
|
||||
|
||||
--there's no more script ran too long
|
||||
--if (not InCombatLockdown() and not UnitAffectingCombat ("player")) then
|
||||
--if (not InCombatLockdown() and not UnitAffectingCombat("player")) then
|
||||
if (DetailsMythicPlusFrame.DevelopmentDebug) then
|
||||
print("Details!", "MythicDungeonFinished() > not in combat, merging last pack of trash now")
|
||||
end
|
||||
@@ -577,7 +577,7 @@ function DetailsMythicPlusFrame.MythicDungeonFinished (fromZoneLeft)
|
||||
|
||||
--merge segments
|
||||
if (_detalhes.mythic_plus.make_overall_when_done and not Details.MythicPlus.IsRestoredState and not fromZoneLeft) then
|
||||
--if (not InCombatLockdown() and not UnitAffectingCombat ("player")) then
|
||||
--if (not InCombatLockdown() and not UnitAffectingCombat("player")) then
|
||||
if (DetailsMythicPlusFrame.DevelopmentDebug) then
|
||||
print("Details!", "MythicDungeonFinished() > not in combat, creating overall segment now")
|
||||
end
|
||||
|
||||
@@ -4,10 +4,10 @@ do
|
||||
|
||||
local _detalhes = _G._detalhes
|
||||
local _
|
||||
local _pairs = pairs
|
||||
local pairs = pairs
|
||||
local ipairs = ipairs
|
||||
local _UnitClass = UnitClass
|
||||
local _select = select
|
||||
local select = select
|
||||
local _unpack = unpack
|
||||
|
||||
local openRaidLib = LibStub:GetLibrary("LibOpenRaid-1.0", true)
|
||||
@@ -172,7 +172,7 @@ do
|
||||
end
|
||||
|
||||
if (Actor.spells) then --correcao pros containers misc, precisa pegar os diferentes tipos de containers de l�
|
||||
for spellid, _ in _pairs(Actor.spells._ActorTable) do
|
||||
for spellid, _ in pairs(Actor.spells._ActorTable) do
|
||||
local class = _detalhes.ClassSpellList [spellid]
|
||||
if (class) then
|
||||
Actor.classe = class
|
||||
@@ -322,7 +322,7 @@ do
|
||||
end
|
||||
else
|
||||
if (Actor.spells) then
|
||||
for spellid, _ in _pairs(Actor.spells._ActorTable) do
|
||||
for spellid, _ in pairs(Actor.spells._ActorTable) do
|
||||
local spec = SpecSpellList [spellid]
|
||||
if (spec) then
|
||||
if (spec ~= Actor.spec) then
|
||||
@@ -356,7 +356,7 @@ do
|
||||
local misc_actor = container_misc._ActorTable [index]
|
||||
local buffs = misc_actor.buff_uptime_spells and misc_actor.buff_uptime_spells._ActorTable
|
||||
if (buffs) then
|
||||
for spellid, spell in _pairs(buffs) do
|
||||
for spellid, spell in pairs(buffs) do
|
||||
local spec = SpecSpellList [spellid]
|
||||
if (spec) then
|
||||
if (spec ~= Actor.spec) then
|
||||
@@ -453,7 +453,7 @@ do
|
||||
end
|
||||
else
|
||||
if (Actor.spells) then --correcao pros containers misc, precisa pegar os diferentes tipos de containers de l�
|
||||
for spellid, _ in _pairs(Actor.spells._ActorTable) do
|
||||
for spellid, _ in pairs(Actor.spells._ActorTable) do
|
||||
local spec = SpecSpellList [spellid]
|
||||
if (spec) then
|
||||
_detalhes.cached_specs [Actor.serial] = spec
|
||||
@@ -481,7 +481,7 @@ do
|
||||
else
|
||||
|
||||
if (Actor.spells) then --correcao pros containers misc, precisa pegar os diferentes tipos de containers de l�
|
||||
for spellid, _ in _pairs(Actor.spells._ActorTable) do
|
||||
for spellid, _ in pairs(Actor.spells._ActorTable) do
|
||||
local spec = SpecSpellList [spellid]
|
||||
if (spec) then
|
||||
_detalhes.cached_specs [Actor.serial] = spec
|
||||
@@ -514,7 +514,7 @@ do
|
||||
local misc_actor = container_misc._ActorTable [index]
|
||||
local buffs = misc_actor.buff_uptime_spells and misc_actor.buff_uptime_spells._ActorTable
|
||||
if (buffs) then
|
||||
for spellid, spell in _pairs(buffs) do
|
||||
for spellid, spell in pairs(buffs) do
|
||||
local spec = SpecSpellList [spellid]
|
||||
if (spec) then
|
||||
|
||||
|
||||
@@ -194,7 +194,7 @@ function _detalhes:CreatePanicWarning()
|
||||
_detalhes.instance_load_failed = CreateFrame("frame", "DetailsPanicWarningFrame", UIParent,"BackdropTemplate")
|
||||
_detalhes.instance_load_failed:SetHeight(80)
|
||||
--tinsert(UISpecialFrames, "DetailsPanicWarningFrame")
|
||||
_detalhes.instance_load_failed.text = _detalhes.instance_load_failed:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
_detalhes.instance_load_failed.text = _detalhes.instance_load_failed:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
_detalhes.instance_load_failed.text:SetPoint("center", _detalhes.instance_load_failed, "center")
|
||||
_detalhes.instance_load_failed.text:SetTextColor (1, 0.6, 0)
|
||||
_detalhes.instance_load_failed:SetBackdrop({bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true})
|
||||
@@ -247,7 +247,7 @@ function _detalhes:ApplyProfile (profile_name, nosave, is_copy)
|
||||
--the key exist and is a table, check for missing values on sub tables
|
||||
elseif (type(value) == "table") then
|
||||
--deploy only copy non existing data
|
||||
_detalhes.table.deploy (profile [key], value)
|
||||
_detalhes.table.deploy(profile [key], value)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -740,7 +740,7 @@ local default_profile = {
|
||||
0.125, -- [4]
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
class_colors = {
|
||||
["DEMONHUNTER"] = {
|
||||
0.64,
|
||||
@@ -846,9 +846,12 @@ local default_profile = {
|
||||
},
|
||||
|
||||
["EVOKER"] = {
|
||||
0.31764705882353, -- [1]
|
||||
0.24313725490196, -- [2]
|
||||
0.91372549019608, -- [3]
|
||||
--0.31764705882353, -- [1]
|
||||
--0.24313725490196, -- [2]
|
||||
--0.91372549019608, -- [3]
|
||||
0.2000,
|
||||
0.4980,
|
||||
0.5764,
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
+2
-2
@@ -578,7 +578,7 @@ function SlashCmdList.DETAILS (msg, editbox)
|
||||
row:SetWidth(200)
|
||||
row:SetHeight(20)
|
||||
row:SetBackdrop({bgFile = "Interface\\AddOns\\Details\\images\\background", tile = true, tileSize = 16, insets = {left = 0, right = 0, top = 0, bottom = 0}})
|
||||
local t = row:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
local t = row:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
t:SetPoint("left", row, "left")
|
||||
row.text = t
|
||||
rows [#rows+1] = row
|
||||
@@ -1944,7 +1944,7 @@ function _detalhes:CreateListPanel()
|
||||
function _detalhes.ListPanel:add (text, index, filter)
|
||||
local row = _detalhes.ListPanel.barras [index]
|
||||
if (not row) then
|
||||
row = {text = _detalhes.ListPanel.container:CreateFontString (nil, "overlay", "GameFontNormal")}
|
||||
row = {text = _detalhes.ListPanel.container:CreateFontString(nil, "overlay", "GameFontNormal")}
|
||||
_detalhes.ListPanel.barras [index] = row
|
||||
row.text:SetPoint("topleft", _detalhes.ListPanel.container, "topleft", 0, -index * 15)
|
||||
end
|
||||
|
||||
@@ -317,7 +317,7 @@ do
|
||||
load_frame = CreateFrame("frame", "DetailsLoadSpellCache", UIParent)
|
||||
load_frame:SetFrameStrata("DIALOG")
|
||||
|
||||
local progress_label = load_frame:CreateFontString ("DetailsLoadSpellCacheProgress", "overlay", "GameFontHighlightSmall")
|
||||
local progress_label = load_frame:CreateFontString("DetailsLoadSpellCacheProgress", "overlay", "GameFontHighlightSmall")
|
||||
progress_label:SetText("Loading Spells: 0%")
|
||||
function _detalhes:BuildSpellListSlowTick()
|
||||
progress_label:SetText("Loading Spells: " .. load_frame:GetProgress() .. "%")
|
||||
|
||||
@@ -11,14 +11,14 @@ local function DebugMessage (...)
|
||||
end
|
||||
|
||||
--Needed locals
|
||||
local _GetTime = GetTime --wow api local
|
||||
local GetTime = GetTime --wow api local
|
||||
local _UFC = UnitAffectingCombat --wow api local
|
||||
local _IsInRaid = IsInRaid --wow api local
|
||||
local _IsInGroup = IsInGroup --wow api local
|
||||
local IsInRaid = IsInRaid --wow api local
|
||||
local IsInGroup = IsInGroup --wow api local
|
||||
local _UnitAura = UnitAura --wow api local
|
||||
local _GetSpellInfo = _detalhes.getspellinfo --wow api local
|
||||
local _CreateFrame = CreateFrame --wow api local
|
||||
local _GetTime = GetTime --wow api local
|
||||
local GetTime = GetTime --wow api local
|
||||
local _GetCursorPosition = GetCursorPosition --wow api local
|
||||
local _GameTooltip = GameTooltip --wow api local
|
||||
|
||||
@@ -27,9 +27,9 @@ local GameCooltip = GameCooltip2
|
||||
local _math_floor = math.floor --lua library local
|
||||
local _cstr = string.format --lua library local
|
||||
local ipairs = ipairs --lua library local
|
||||
local _pairs = pairs --lua library local
|
||||
local pairs = pairs --lua library local
|
||||
local _table_sort = table.sort --lua library local
|
||||
local _table_insert = table.insert --lua library local
|
||||
local tinsert = table.insert --lua library local
|
||||
local _unpack = unpack --lua library local
|
||||
local _bit_band = bit.band
|
||||
|
||||
@@ -752,7 +752,7 @@ local function DispellInfo (dispell, barra)
|
||||
local jogadores = dispell [1] --[nome od jogador] = total
|
||||
local tabela_jogadores = {}
|
||||
|
||||
for nome, tabela in _pairs(jogadores) do --tabela = [1] total tomado [2] classe
|
||||
for nome, tabela in pairs(jogadores) do --tabela = [1] total tomado [2] classe
|
||||
tabela_jogadores [#tabela_jogadores + 1] = {nome, tabela [1], tabela [2]}
|
||||
end
|
||||
|
||||
@@ -792,7 +792,7 @@ local function KickBy (magia, barra)
|
||||
local jogadores = magia [1] --[nome od jogador] = total
|
||||
local tabela_jogadores = {}
|
||||
|
||||
for nome, tabela in _pairs(jogadores) do --tabela = [1] total tomado [2] classe
|
||||
for nome, tabela in pairs(jogadores) do --tabela = [1] total tomado [2] classe
|
||||
tabela_jogadores [#tabela_jogadores + 1] = {nome, tabela [1], tabela [2]}
|
||||
end
|
||||
|
||||
@@ -840,7 +840,7 @@ local function EnemySkills (habilidade, barra)
|
||||
local tabela_jogadores = {}
|
||||
local total = 0
|
||||
|
||||
for nome, tabela in _pairs(jogadores) do --tabela = [1] total tomado [2] classe
|
||||
for nome, tabela in pairs(jogadores) do --tabela = [1] total tomado [2] classe
|
||||
tabela_jogadores [#tabela_jogadores + 1] = {nome, tabela[1], tabela[2]}
|
||||
total = total + tabela[1]
|
||||
end
|
||||
@@ -900,13 +900,13 @@ local function DamageTakenDetails (jogador, barra)
|
||||
|
||||
local meus_agressores = {}
|
||||
|
||||
for nome, _ in _pairs(agressores) do --agressores seria a lista de nomes
|
||||
for nome, _ in pairs(agressores) do --agressores seria a lista de nomes
|
||||
local este_agressor = showing._ActorTable[showing._NameIndexTable[nome]]
|
||||
if (este_agressor) then --checagem por causa do total e do garbage collector que n�o limpa os nomes que deram dano
|
||||
local habilidades = este_agressor.spells._ActorTable
|
||||
for id, habilidade in _pairs(habilidades) do
|
||||
for id, habilidade in pairs(habilidades) do
|
||||
local alvos = habilidade.targets
|
||||
for target_name, amount in _pairs(alvos) do
|
||||
for target_name, amount in pairs(alvos) do
|
||||
if (target_name == jogador.nome) then
|
||||
meus_agressores [#meus_agressores+1] = {id, amount, este_agressor.nome}
|
||||
end
|
||||
@@ -1021,7 +1021,7 @@ function EncounterDetails:SetRowScripts (barra, index, container)
|
||||
return
|
||||
end
|
||||
|
||||
self.mouse_down = _GetTime()
|
||||
self.mouse_down = GetTime()
|
||||
local x, y = _GetCursorPosition()
|
||||
self.x = _math_floor(x)
|
||||
self.y = _math_floor(y)
|
||||
@@ -1047,7 +1047,7 @@ function EncounterDetails:SetRowScripts (barra, index, container)
|
||||
x = _math_floor(x)
|
||||
y = _math_floor(y)
|
||||
|
||||
if ((self.mouse_down+0.4 > _GetTime() and (x == self.x and y == self.y)) or (x == self.x and y == self.y)) then
|
||||
if ((self.mouse_down+0.4 > GetTime() and (x == self.x and y == self.y)) or (x == self.x and y == self.y)) then
|
||||
_detalhes:BossInfoRowClick (self)
|
||||
end
|
||||
end)
|
||||
@@ -1382,7 +1382,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
|
||||
local habilidades_usadas = {}
|
||||
local have_pool = false
|
||||
for spellid, _ in _pairs(habilidades_poll) do
|
||||
for spellid, _ in pairs(habilidades_poll) do
|
||||
have_pool = true
|
||||
break
|
||||
end
|
||||
@@ -1399,7 +1399,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
|
||||
local habilidades = jogador.spells._ActorTable
|
||||
|
||||
for id, habilidade in _pairs(habilidades) do
|
||||
for id, habilidade in pairs(habilidades) do
|
||||
--if (habilidades_poll [id]) then
|
||||
--esse jogador usou uma habilidade do boss
|
||||
local esta_habilidade = habilidades_usadas [id] --tabela n�o numerica, pq diferentes monstros podem castar a mesma magia
|
||||
@@ -1420,7 +1420,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
|
||||
--pega os alvos e adiciona ao [2]
|
||||
local alvos = habilidade.targets
|
||||
for target_name, amount in _pairs(alvos) do
|
||||
for target_name, amount in pairs(alvos) do
|
||||
|
||||
--ele tem o nome do jogador, vamos ver se este alvo � realmente um jogador verificando na tabela do combate
|
||||
local tabela_dano_do_jogador = DamageContainer._ActorTable [DamageContainer._NameIndexTable [target_name]]
|
||||
@@ -1438,7 +1438,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
--check if the spell id is in the spell poll.
|
||||
local habilidades = jogador.spells._ActorTable
|
||||
|
||||
for id, habilidade in _pairs(habilidades) do
|
||||
for id, habilidade in pairs(habilidades) do
|
||||
if (habilidades_poll [id]) then
|
||||
--esse jogador usou uma habilidade do boss
|
||||
local esta_habilidade = habilidades_usadas [id] --tabela n�o numerica, pq diferentes monstros podem castar a mesma magia
|
||||
@@ -1459,7 +1459,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
|
||||
--pega os alvos e adiciona ao [2]
|
||||
local alvos = habilidade.targets
|
||||
for target_name, amount in _pairs(alvos) do
|
||||
for target_name, amount in pairs(alvos) do
|
||||
|
||||
--ele tem o nome do jogador, vamos ver se este alvo � realmente um jogador verificando na tabela do combate
|
||||
local tabela_dano_do_jogador = DamageContainer._ActorTable [DamageContainer._NameIndexTable [target_name]]
|
||||
@@ -1479,7 +1479,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
local tabela_em_ordem = {}
|
||||
local jaFoi = {}
|
||||
|
||||
for id, tabela in _pairs(habilidades_usadas) do
|
||||
for id, tabela in pairs(habilidades_usadas) do
|
||||
local spellname = Details.GetSpellInfo(tabela [4])
|
||||
|
||||
if (not jaFoi [spellname]) then
|
||||
@@ -1608,7 +1608,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
tabela.total = jogador.total
|
||||
|
||||
--em quem ele deu dano
|
||||
for target_name, amount in _pairs(jogador.targets) do
|
||||
for target_name, amount in pairs(jogador.targets) do
|
||||
local este_jogador = _combat_object (1, target_name)
|
||||
if (este_jogador) then
|
||||
if (este_jogador.classe ~= "PET" and este_jogador.classe ~= "UNGROUPPLAYER" and este_jogador.classe ~= "UNKNOW") then
|
||||
@@ -1620,11 +1620,11 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
_table_sort (tabela.dano_em, _detalhes.Sort2)
|
||||
|
||||
--quem deu dano nele
|
||||
for agressor, _ in _pairs(jogador.damage_from) do
|
||||
for agressor, _ in pairs(jogador.damage_from) do
|
||||
--local este_jogador = DamageContainer._ActorTable [DamageContainer._NameIndexTable [agressor]]
|
||||
local este_jogador = _combat_object (1, agressor)
|
||||
if (este_jogador and este_jogador:IsPlayer()) then
|
||||
for target_name, amount in _pairs(este_jogador.targets) do
|
||||
for target_name, amount in pairs(este_jogador.targets) do
|
||||
if (target_name == nome) then
|
||||
tabela.damage_from [#tabela.damage_from+1] = {agressor, amount, este_jogador.classe}
|
||||
tabela.damage_from_total = tabela.damage_from_total + amount
|
||||
@@ -1661,7 +1661,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
local topDamage = dano_em[1] and dano_em[1][2]
|
||||
|
||||
local dano_em_total = tabela.dano_em_total
|
||||
for _, esta_tabela in _pairs(dano_em) do
|
||||
for _, esta_tabela in pairs(dano_em) do
|
||||
local coords = EncounterDetails.class_coords [esta_tabela[3]]
|
||||
GameCooltip:AddLine(EncounterDetails:GetOnlyName(esta_tabela[1]), _detalhes:ToK (esta_tabela[2]).." (".. _cstr ("%.1f", esta_tabela[2]/dano_em_total*100) .."%)", 1, "white", "orange")
|
||||
|
||||
@@ -1708,7 +1708,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
local damage_from_total = tabela.damage_from_total
|
||||
local topDamage = damage_from[1] and damage_from[1][2]
|
||||
|
||||
for _, esta_tabela in _pairs(damage_from) do
|
||||
for _, esta_tabela in pairs(damage_from) do
|
||||
|
||||
local coords = EncounterDetails.class_coords [esta_tabela[3]]
|
||||
if (coords) then
|
||||
@@ -1866,7 +1866,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
local oque_interrompi = jogador.interrompeu_oque
|
||||
--vai ter [spellid] = quantidade
|
||||
|
||||
for spellid, amt in _pairs(oque_interrompi) do
|
||||
for spellid, amt in pairs(oque_interrompi) do
|
||||
if (not habilidades_interrompidas [spellid]) then --se a spell n�o tiver na pool, cria a tabela dela
|
||||
habilidades_interrompidas [spellid] = {{}, 0, spellid} --tabela com quem interrompeu e o total de vezes que a habilidade foi interrompida
|
||||
end
|
||||
@@ -1884,7 +1884,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
|
||||
--por em ordem
|
||||
tabela_em_ordem = {}
|
||||
for spellid, tabela in _pairs(habilidades_interrompidas) do
|
||||
for spellid, tabela in pairs(habilidades_interrompidas) do
|
||||
tabela_em_ordem [#tabela_em_ordem+1] = tabela
|
||||
end
|
||||
_table_sort (tabela_em_ordem, _detalhes.Sort2)
|
||||
@@ -1978,7 +1978,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
|
||||
--print("dispell: " .. jogador.classe .. " nome: " .. jogador.nome)
|
||||
|
||||
for spellid, amt in _pairs(oque_dispelei) do
|
||||
for spellid, amt in pairs(oque_dispelei) do
|
||||
if (not habilidades_dispeladas [spellid]) then --se a spell n�o tiver na pool, cria a tabela dela
|
||||
habilidades_dispeladas [spellid] = {{}, 0, spellid} --tabela com quem dispolou e o total de vezes que a habilidade foi dispelada
|
||||
end
|
||||
@@ -1998,7 +1998,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
|
||||
--por em ordem
|
||||
tabela_em_ordem = {}
|
||||
for spellid, tabela in _pairs(habilidades_dispeladas) do
|
||||
for spellid, tabela in pairs(habilidades_dispeladas) do
|
||||
tabela_em_ordem [#tabela_em_ordem+1] = tabela
|
||||
end
|
||||
_table_sort (tabela_em_ordem, _detalhes.Sort2)
|
||||
@@ -2066,7 +2066,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
|
||||
local habilidades_info = boss_info and boss_info.spell_mechanics or {} --barra.extra pega esse cara aqui --ent�o esse erro � das habilidades que n�o tao
|
||||
|
||||
for index, tabela in ipairs(mortes) do
|
||||
--{esta_morte, time, este_jogador.nome, este_jogador.classe, _UnitHealthMax (alvo_name), minutos.."m "..segundos.."s", ["dead"] = true}
|
||||
--{esta_morte, time, este_jogador.nome, este_jogador.classe, UnitHealthMax (alvo_name), minutos.."m "..segundos.."s", ["dead"] = true}
|
||||
local barra = container.barras [index]
|
||||
if (not barra) then
|
||||
barra = EncounterDetails:CreateRow (index, container, 3, 0, 1)
|
||||
|
||||
@@ -189,12 +189,12 @@ _detalhes.EncounterDetailsTempWindow = function(EncounterDetails)
|
||||
row.textura:SetStatusBarColor (.5, .5, .5, 0)
|
||||
row.textura:SetMinMaxValues(0,100)
|
||||
|
||||
row.lineText1 = row.textura:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
row.lineText1 = row.textura:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
row.lineText1:SetPoint("LEFT", row.textura, "LEFT", 22, -1)
|
||||
row.lineText1:SetJustifyH("LEFT")
|
||||
row.lineText1:SetTextColor (1,1,1,1)
|
||||
|
||||
row.lineText4 = row.textura:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
row.lineText4 = row.textura:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
row.lineText4:SetPoint("RIGHT", row.textura, "RIGHT", -2, 0)
|
||||
row.lineText4:SetJustifyH("RIGHT")
|
||||
row.lineText4:SetTextColor (1,1,1,1)
|
||||
@@ -994,7 +994,7 @@ _detalhes.EncounterDetailsTempWindow = function(EncounterDetails)
|
||||
texture:SetHeight(9)
|
||||
texture:SetPoint("TOPLEFT", EncounterDetails.Frame, "TOPLEFT", (i*65) + 499, -81)
|
||||
texture:SetColorTexture (unpack(grafico_cores[i]))
|
||||
local text = g:CreateFontString (nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
local text = g:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||
text:SetPoint("LEFT", texture, "right", 2, 0)
|
||||
text:SetJustifyH("LEFT")
|
||||
if (i == 1) then
|
||||
@@ -1579,13 +1579,13 @@ _detalhes.EncounterDetailsTempWindow = function(EncounterDetails)
|
||||
line.icon:SetPoint("left", line, "left", 2, 0)
|
||||
line.icon:SetSize(14, 14)
|
||||
|
||||
line.lefttext = line:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
line.lefttext = line:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
line.lefttext:SetPoint("left", line.icon, "right", 2, 0)
|
||||
line.lefttext:SetWidth(line:GetWidth() - 26)
|
||||
line.lefttext:SetHeight(14)
|
||||
line.lefttext:SetJustifyH("left")
|
||||
|
||||
line.righttext = line:CreateFontString (nil, "overlay", "GameFontHighlightSmall")
|
||||
line.righttext = line:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
|
||||
line.righttext:SetPoint("left", line.icon, "right", 46, 0)
|
||||
line.righttext:SetWidth(line:GetWidth() - 60)
|
||||
line.righttext:SetHeight(14)
|
||||
@@ -1916,7 +1916,7 @@ _detalhes.EncounterDetailsTempWindow = function(EncounterDetails)
|
||||
spellinfo:SetScript("OnEnter", info_onenter)
|
||||
spellinfo:SetScript("OnLeave", info_onleave)
|
||||
|
||||
local spellinfotext = spellinfo:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local spellinfotext = spellinfo:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
spellinfotext:SetPoint("center", spellinfo, "center")
|
||||
spellinfotext:SetText("info")
|
||||
spellinfo:SetPoint("left", spellname.widget, "right", 4, 0)
|
||||
@@ -2380,13 +2380,13 @@ local ScrollCreateLine = function(self, index)
|
||||
local icon = statusBar:CreateTexture("$parentIcon", "overlay")
|
||||
icon:SetSize(ScrollLineHeight, ScrollLineHeight)
|
||||
|
||||
local name = statusBar:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local name = statusBar:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
_detalhes.gump:SetFontSize (name, 10)
|
||||
icon:SetPoint("left", line, "left", 2, 0)
|
||||
name:SetPoint("left", icon, "right", 2, 0)
|
||||
_detalhes.gump:SetFontColor(name, "white")
|
||||
|
||||
local done = statusBar:CreateFontString ("$parentDone", "overlay", "GameFontNormal")
|
||||
local done = statusBar:CreateFontString("$parentDone", "overlay", "GameFontNormal")
|
||||
_detalhes.gump:SetFontSize (done, 10)
|
||||
_detalhes.gump:SetFontColor(done, "white")
|
||||
done:SetPoint("right", line, "right", -2, 0)
|
||||
@@ -2456,9 +2456,9 @@ for i = 1, 10 do
|
||||
local icon = line:CreateTexture("$parentIcon", "overlay")
|
||||
icon:SetSize(16, 16)
|
||||
icon:SetTexture([[Interface\AddOns\Details\images\clock]])
|
||||
local name = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local name = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
_detalhes.gump:SetFontSize (name, 10)
|
||||
local done = line:CreateFontString ("$parentDone", "overlay", "GameFontNormal")
|
||||
local done = line:CreateFontString("$parentDone", "overlay", "GameFontNormal")
|
||||
_detalhes.gump:SetFontSize (done, 10)
|
||||
|
||||
icon:SetPoint("left", line, "left", 2, 0)
|
||||
@@ -2484,11 +2484,11 @@ for i = 1, 20 do
|
||||
line:SetBackdrop({bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true})
|
||||
line:SetBackdropColor(unpack(BGColorDefault))
|
||||
line:Hide()
|
||||
local name = line:CreateFontString ("$parentName", "overlay", "GameFontNormal")
|
||||
local name = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
|
||||
_detalhes.gump:SetFontSize (name, 9)
|
||||
name:SetPoint("left", line, "left", 2, 0)
|
||||
|
||||
local done = line:CreateFontString ("$parentDone", "overlay", "GameFontNormal")
|
||||
local done = line:CreateFontString("$parentDone", "overlay", "GameFontNormal")
|
||||
_detalhes.gump:SetFontSize (done, 9)
|
||||
done:SetPoint("right", line, "right", -2, 0)
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@ local function CreatePluginFrames()
|
||||
titlebar:SetPoint("bottomright", SOF, "topright")
|
||||
titlebar:SetBackdrop({bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tile = true, tileSize = 16, insets = {left = 0, right = 0, top = 0, bottom = 0}})
|
||||
titlebar:SetBackdropColor(.1, .1, .1, .9)
|
||||
titlebar.text = titlebar:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
titlebar.text = titlebar:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
titlebar.text:SetPoint("center", titlebar, "center")
|
||||
titlebar.text:SetText("Details! Streamer: Action Tracker")
|
||||
titlebar:SetScript("OnEnter", function(self)
|
||||
@@ -609,8 +609,8 @@ local function CreatePluginFrames()
|
||||
|
||||
local arrow = statusbar:CreateTexture(nil, "overlay")
|
||||
|
||||
local text1 = statusbar:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local text2 = statusbar:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local text1 = statusbar:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
local text2 = statusbar:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
|
||||
icon1:SetPoint("left", f, "left", 2, 0) --player spell icon
|
||||
text1:SetPoint("left", icon1, "right", 2, 0) --player spell name
|
||||
@@ -1610,7 +1610,7 @@ screen_frame:SetScript("OnLeave", function()
|
||||
end)
|
||||
|
||||
|
||||
local screen_frame_text = screen_frame:CreateFontString ("StreamerOverlayDpsHpsFrameText", "overlay", "GameFontNormal")
|
||||
local screen_frame_text = screen_frame:CreateFontString("StreamerOverlayDpsHpsFrameText", "overlay", "GameFontNormal")
|
||||
screen_frame_text:SetPoint("center", screen_frame, "center")
|
||||
screen_frame.text = screen_frame_text
|
||||
|
||||
@@ -2219,7 +2219,7 @@ function StreamOverlay.OpenOptionsPanel (fromOptionsPanel)
|
||||
--get the selected profile and overwrite the settings
|
||||
local ptable = Details_StreamerDB.profiles [profileName]
|
||||
|
||||
_detalhes.table.deploy (ptable, StreamOverlay.DefaultConfigTable) --update with any new config from the default table
|
||||
_detalhes.table.deploy(ptable, StreamOverlay.DefaultConfigTable) --update with any new config from the default table
|
||||
_detalhes.table.overwrite (StreamOverlay.db, ptable) --overwrite the local settings with the profile settings
|
||||
|
||||
Details_StreamerDB.characters [pname] = profileName
|
||||
@@ -2269,7 +2269,7 @@ function StreamOverlay.OpenOptionsPanel (fromOptionsPanel)
|
||||
--load dbtable
|
||||
Details_StreamerDB.profiles [pname] = {}
|
||||
_detalhes.table.overwrite (Details_StreamerDB.profiles [pname], StreamOverlay.db)
|
||||
_detalhes.table.deploy (Details_StreamerDB.profiles [pname], StreamOverlay.DefaultConfigTable) --update with any new config from the default table
|
||||
_detalhes.table.deploy(Details_StreamerDB.profiles [pname], StreamOverlay.DefaultConfigTable) --update with any new config from the default table
|
||||
--StreamOverlay.db = Details_StreamerDB.profiles [pname] --no can't change the local database table
|
||||
|
||||
optionsFrame.NewProfileButton:Hide()
|
||||
@@ -2456,7 +2456,7 @@ function StreamOverlay:OnEvent (_, event, ...)
|
||||
|
||||
local icon = welcomeWindow:CreateTexture(nil, "overlay")
|
||||
icon:SetTexture([[Interface\MINIMAP\MOVIERECORDINGICON]])
|
||||
local title = welcomeWindow:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local title = welcomeWindow:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
title:SetText("Details!: Action Tracker (plugin)")
|
||||
StreamOverlay:SetFontSize (title, 20)
|
||||
|
||||
@@ -2466,11 +2466,11 @@ function StreamOverlay:OnEvent (_, event, ...)
|
||||
youtubeTwitchIcons:SetSize(109, 413 - 370)
|
||||
youtubeTwitchIcons:SetPoint("topleft", welcomeWindow, "topleft", 123, -61)
|
||||
|
||||
local text1 = welcomeWindow:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local text1 = welcomeWindow:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
text1:SetText("SHOW TO YOUR VIEWERS YOUR ROTATION\nThis way they can learn while watching your content")
|
||||
local text2 = welcomeWindow:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local text2 = welcomeWindow:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
text2:SetText("Use the command:")
|
||||
local text3 = welcomeWindow:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
local text3 = welcomeWindow:CreateFontString(nil, "overlay", "GameFontNormal")
|
||||
text3:SetText("/streamer")
|
||||
DetailsFramework:SetFontSize(text3, 16)
|
||||
|
||||
@@ -2513,7 +2513,7 @@ function StreamOverlay:OnEvent (_, event, ...)
|
||||
--load dbtable
|
||||
local ptable = Details_StreamerDB.profiles [ Details_StreamerDB.characters [pname] ] or {} --already existen config set or empty table
|
||||
_detalhes.table.overwrite (StreamOverlay.db, ptable) --profile overwrite the local settings
|
||||
_detalhes.table.deploy (ptable, StreamOverlay.db) --local settings deploy stuff which non exist on profile
|
||||
_detalhes.table.deploy(ptable, StreamOverlay.db) --local settings deploy stuff which non exist on profile
|
||||
|
||||
Details_StreamerDB.profiles [ Details_StreamerDB.characters [pname] ] = ptable
|
||||
end
|
||||
|
||||
@@ -2,11 +2,11 @@ local AceLocale = LibStub("AceLocale-3.0")
|
||||
local Loc = AceLocale:GetLocale ("Details_Threat")
|
||||
|
||||
local _GetNumSubgroupMembers = GetNumSubgroupMembers --wow api
|
||||
local _GetNumGroupMembers = GetNumGroupMembers --wow api
|
||||
local GetNumGroupMembers = GetNumGroupMembers --wow api
|
||||
local _UnitIsFriend = UnitIsFriend --wow api
|
||||
local _UnitName = UnitName --wow api
|
||||
local _IsInRaid = IsInRaid --wow api
|
||||
local _IsInGroup = IsInGroup --wow api
|
||||
local IsInRaid = IsInRaid --wow api
|
||||
local IsInGroup = IsInGroup --wow api
|
||||
local _UnitGroupRolesAssigned = DetailsFramework.UnitGroupRolesAssigned --wow api
|
||||
local GetUnitName = GetUnitName
|
||||
|
||||
@@ -102,7 +102,7 @@ local function CreatePluginFrames (data)
|
||||
|
||||
ThreatMeter.Actived = false
|
||||
|
||||
if (ThreatMeter:IsInCombat() or UnitAffectingCombat ("player")) then
|
||||
if (ThreatMeter:IsInCombat() or UnitAffectingCombat("player")) then
|
||||
if (not ThreatMeter.initialized) then
|
||||
return
|
||||
end
|
||||
@@ -323,8 +323,8 @@ local function CreatePluginFrames (data)
|
||||
if (ThreatMeter.Actived and UnitExists(unitId) and not _UnitIsFriend("player", unitId)) then
|
||||
|
||||
--get the threat of all players
|
||||
if (_IsInRaid()) then
|
||||
for i = 1, _GetNumGroupMembers(), 1 do
|
||||
if (IsInRaid()) then
|
||||
for i = 1, GetNumGroupMembers(), 1 do
|
||||
|
||||
local thisplayer_name = GetUnitName("raid"..i, true)
|
||||
local threat_table_index = ThreatMeter.player_list_hash [thisplayer_name]
|
||||
@@ -340,8 +340,8 @@ local function CreatePluginFrames (data)
|
||||
|
||||
end
|
||||
|
||||
elseif (_IsInGroup()) then
|
||||
for i = 1, _GetNumGroupMembers()-1, 1 do
|
||||
elseif (IsInGroup()) then
|
||||
for i = 1, GetNumGroupMembers()-1, 1 do
|
||||
local thisplayer_name = GetUnitName("party"..i, true)
|
||||
local threat_table_index = ThreatMeter.player_list_hash [thisplayer_name]
|
||||
local threat_table = ThreatMeter.player_list_indexes [threat_table_index]
|
||||
@@ -661,8 +661,8 @@ local function CreatePluginFrames (data)
|
||||
ThreatMeter.player_list_hash = {}
|
||||
|
||||
--pre build player list
|
||||
if (_IsInRaid()) then
|
||||
for i = 1, _GetNumGroupMembers(), 1 do
|
||||
if (IsInRaid()) then
|
||||
for i = 1, GetNumGroupMembers(), 1 do
|
||||
local thisplayer_name = GetUnitName("raid"..i, true)
|
||||
local role = _UnitGroupRolesAssigned(thisplayer_name)
|
||||
local _, class = UnitClass (thisplayer_name)
|
||||
@@ -671,8 +671,8 @@ local function CreatePluginFrames (data)
|
||||
ThreatMeter.player_list_hash [thisplayer_name] = #ThreatMeter.player_list_indexes
|
||||
end
|
||||
|
||||
elseif (_IsInGroup()) then
|
||||
for i = 1, _GetNumGroupMembers()-1, 1 do
|
||||
elseif (IsInGroup()) then
|
||||
for i = 1, GetNumGroupMembers()-1, 1 do
|
||||
local thisplayer_name = GetUnitName("party"..i, true)
|
||||
local role = _UnitGroupRolesAssigned(thisplayer_name)
|
||||
local _, class = UnitClass (thisplayer_name)
|
||||
|
||||
@@ -15,14 +15,14 @@ local DF = _G.DetailsFramework
|
||||
--ignorar bloodlust, shield d priest
|
||||
--reler os tanks ao sair de um grupo
|
||||
|
||||
local _GetTime = GetTime --wow api local
|
||||
local GetTime = GetTime --wow api local
|
||||
local _UFC = UnitAffectingCombat --wow api local
|
||||
local _IsInRaid = IsInRaid --wow api local
|
||||
local _IsInGroup = IsInGroup --wow api local
|
||||
local IsInRaid = IsInRaid --wow api local
|
||||
local IsInGroup = IsInGroup --wow api local
|
||||
local _UnitName = UnitName --wow api local
|
||||
local _UnitGroupRolesAssigned = DetailsFramework.UnitGroupRolesAssigned
|
||||
local _UnitHealth = UnitHealth --wow api local
|
||||
local _UnitHealthMax = UnitHealthMax --wow api local
|
||||
local UnitHealth = UnitHealth --wow api local
|
||||
local UnitHealthMax = UnitHealthMax --wow api local
|
||||
local _UnitIsPlayer = UnitIsPlayer --wow api local
|
||||
local _UnitClass = UnitClass --wow api local
|
||||
local _UnitDebuff = UnitDebuff --wow api local
|
||||
@@ -36,10 +36,10 @@ local CONST_DEBUFF_AMOUNT = 5
|
||||
local CONST_MAX_TANKS = 2
|
||||
|
||||
local _cstr = string.format --lua library local
|
||||
local _table_insert = table.insert --lua library local
|
||||
local tinsert = table.insert --lua library local
|
||||
local _table_remove = table.remove --lua library local
|
||||
local ipairs = ipairs --lua library local
|
||||
local _pairs = pairs --lua library local
|
||||
local pairs = pairs --lua library local
|
||||
local _math_floor = math.floor --lua library local
|
||||
local abs = math.abs --lua library local
|
||||
local _math_min = math.min --lua library local
|
||||
@@ -499,7 +499,7 @@ local function CreatePluginFrames (data)
|
||||
elevateStringsFrame:SetFrameLevel(dblock:GetFrameLevel()+10)
|
||||
elevateStringsFrame:EnableMouse(false)
|
||||
|
||||
local stack = elevateStringsFrame:CreateFontString (elevateStringsFrame:GetName() .. "_StackText", "overlay", "GameFontNormal")
|
||||
local stack = elevateStringsFrame:CreateFontString(elevateStringsFrame:GetName() .. "_StackText", "overlay", "GameFontNormal")
|
||||
stack:SetPoint("bottomright", dblock, "bottomright", 0, 0)
|
||||
DetailsFramework:SetFontColor(stack, "yellow")
|
||||
|
||||
|
||||
@@ -571,6 +571,13 @@ function Details:StartMeUp() --I'll never stop!
|
||||
--shutdown the old OnDeathMenu
|
||||
--cleanup: this line can be removed after the first month of dragonflight
|
||||
Details.on_death_menu = false
|
||||
|
||||
--reset to default the evoker color
|
||||
local defaultEvokerColor = _detalhes.default_profile.class_colors.EVOKER
|
||||
local currentEvokerColorTable = _detalhes.class_colors.EVOKER
|
||||
currentEvokerColorTable[1] = defaultEvokerColor[1]
|
||||
currentEvokerColorTable[2] = defaultEvokerColor[2]
|
||||
currentEvokerColorTable[3] = defaultEvokerColor[3]
|
||||
end
|
||||
|
||||
Details.AddOnLoadFilesTime = _G.GetTime()
|
||||
|
||||
Reference in New Issue
Block a user