diff --git a/Definitions.lua b/Definitions.lua index c7d64cb3..c3e00bf6 100644 --- a/Definitions.lua +++ b/Definitions.lua @@ -85,7 +85,7 @@ ---@field key6 string time of death as string ---@field dead boolean just a boolean to indicate this is a death table ---@field last_cooldown {key1: unixtime, key2: spellid} ----@field dead_at number combatElapsedTime +---@field dead_at combattime ---@class customspellinfo : {name: string, isPassive: boolean, itemId: number, icon: string|number} ---@class customiteminfo: {itemId: number, isPassive: boolean} diff --git a/Libs/LibLuaServer/LuaServerDefinitions.lua b/Libs/LibLuaServer/LuaServerDefinitions.lua index ee81068d..ac7619ea 100644 --- a/Libs/LibLuaServer/LuaServerDefinitions.lua +++ b/Libs/LibLuaServer/LuaServerDefinitions.lua @@ -6,11 +6,12 @@ --alpha: corresponds to the transparency of an object, the bigger is the value less transparent is the object, it is measure in percentage, must be between 0 and 1, zero is fully transparent and one is fully opaque. --controller: abstract term to define who's in control of an entity, can be the server or a player. --npc: an entity shown in the 3d world with a name and a health bar, can be friendly or hostile, can be interacted with, always controlled by the server. ---player: is an entity that represents a player character, the controller is always player. +--player: is an entity that represents a player character, the controller is always player, player is always a human. --pet: represents a npc controlled by the server and can accept commands from the player. --guadians: represents a npc, the server has the possess of the controller, don't accept commands like pets, helps attacking the enemies of the npc or player. --role: is a string that represents the role of a unit, such as tank, healer, or damage dealer. only players can have a role. + ---@alias role ---| "TANK" ---| "HEALER" @@ -114,6 +115,9 @@ ---@alias alpha number @number(0-1.0) value representing the alpha (transparency) of a UIObject, the value must be between 0 and 1. 0 is fully transparent, 1 is fully opaque. ---@alias unit string string that represents a unit in the game, such as the player, a party member, or a raid member. ---@alias health number amount of hit points (health) of a unit. This value can be changed by taking damage or healing. +---@alias encounterid number encounter ID number received by the event ENCOUNTER_START and ENCOUNTER_END +---@alias encounterejid number encounter ID number used by the encounter journal +---@alias encountername string encounter name received by the event ENCOUNTER_START and ENCOUNTER_END also used by the encounter journal ---@alias spellid number each spell in the game has a unique spell id, this id can be used to identify a spell. ---@alias actorname string name of a unit ---@alias petname string refers to a pet's name diff --git a/classes/class_instance.lua b/classes/class_instance.lua index 83f44d7a..3e8dbe79 100644 --- a/classes/class_instance.lua +++ b/classes/class_instance.lua @@ -2603,7 +2603,7 @@ function Details:SetDisplay(segment, attribute, subAttribute, isInstanceStarup, return self:TrocaTabela(self, segment, attribute, subAttribute, isInstanceStarup, instanceMode) end ----change the data shown in the window +---change the data shown in the window (marked as legacy on June 27 2023, soon will be deprecated for instance:SetSegment, instance:SetDisplay and instance:SetMode) ---@param instance instance ---@param segmentId number ---@param attributeId number @@ -2772,7 +2772,8 @@ function Details:TrocaTabela(instance, segmentId, attributeId, subAttributeId, f if (Details.instances_segments_locked and not fromInstanceStart) then for _, thisInstance in ipairs(Details.tabela_instancias) do if (thisInstance.meu_id ~= instance.meu_id and thisInstance.ativa and not thisInstance._postponing_switch and not thisInstance._postponing_current) then - if (thisInstance:GetSegment() >= 0) then + --if (thisInstance:GetSegment() >= 0 and instance:GetSegment() ~= DETAILS_SEGMENTID_OVERALL) then + if (true) then if (thisInstance.modo == 2 or thisInstance.modo == 3) then --check if the instance is frozen if (thisInstance.freezed) then diff --git a/functions/boss.lua b/functions/boss.lua index 1670fc53..9f3dc496 100644 --- a/functions/boss.lua +++ b/functions/boss.lua @@ -46,19 +46,19 @@ do return Details.EncounterInformation [mapid] and Details.EncounterInformation [mapid].trash_ids end - function Details:GetInstanceIdFromEncounterId (encounterid) + function Details:GetInstanceIdFromEncounterId (encounterId) for id, instanceTable in pairs(Details.EncounterInformation) do --combatlog encounter id local ids = instanceTable.encounter_ids2 if (ids) then - if (ids [encounterid]) then + if (ids[encounterId]) then return id end end --encounter journal id local ids_ej = instanceTable.encounter_ids if (ids) then - if (ids_ej [encounterid]) then + if (ids_ej[encounterId]) then return id end end diff --git a/functions/profiles.lua b/functions/profiles.lua index 8b20dd4b..67b23785 100644 --- a/functions/profiles.lua +++ b/functions/profiles.lua @@ -600,6 +600,7 @@ local default_profile = { [1467] = {256/512, 320/512, 256/512, 320/512}, -- Devastation [1468] = {320/512, 384/512, 256/512, 320/512}, -- Preservation + [1473] = {384/512, 448/512, 256/512, 320/512}, -- Augmentation }, --class icons and colors diff --git a/functions/spells.lua b/functions/spells.lua index 6b48d2aa..45fec6ab 100644 --- a/functions/spells.lua +++ b/functions/spells.lua @@ -12,6 +12,11 @@ do if (DetailsFramework.IsDragonflight()) then --/details generatespelllist _detalhes.SpecSpellList = { --~spec + --Evoker Augmentation + [409632] = 1473, --Breath of Eons + [396288] = 1473, --Upheaval + [395160] = 1473, --Eruption + --Unholy Death Knight: [390175] = 252, --Plaguebringer [275699] = 252, --Apocalypse diff --git a/images/spec_icons_normal.tga b/images/spec_icons_normal.tga index 6146633a..745a97a3 100644 Binary files a/images/spec_icons_normal.tga and b/images/spec_icons_normal.tga differ