Merging Seal of Command on Wrath classic

This commit is contained in:
Tercio Jose
2022-10-10 16:51:56 -03:00
parent 1ed29008aa
commit 69899679e7
63 changed files with 1655 additions and 1638 deletions
+6 -6
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -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
+1 -1
View File
@@ -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)
+6 -6
View File
@@ -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
View File
@@ -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
View File
@@ -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")