Merging Seal of Command on Wrath classic
This commit is contained in:
+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() .. "%")
|
||||
|
||||
Reference in New Issue
Block a user