From 318555ae51aa78de1951f935519d84d13aa3a1db Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Fri, 30 Jun 2023 15:04:05 -0300 Subject: [PATCH] More fixes for Augmentation Evoker on 10.1.5 --- Definitions.lua | 2 +- Libs/LibLuaServer/LuaServerDefinitions.lua | 6 +++++- classes/class_instance.lua | 5 +++-- functions/boss.lua | 6 +++--- functions/profiles.lua | 1 + functions/spells.lua | 5 +++++ images/spec_icons_normal.tga | Bin 1048620 -> 1048620 bytes 7 files changed, 18 insertions(+), 7 deletions(-) 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 6146633a1749175b64fda6b65acb523402fbd455..745a97a341b58c9eb3efaa3d401b3721094dce3d 100644 GIT binary patch delta 15096 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 E2HF~Ang9R*