diff --git a/AuraControl.lua b/AuraControl.lua index 6831ca4..dc1ea08 100644 --- a/AuraControl.lua +++ b/AuraControl.lua @@ -82,18 +82,18 @@ local function AuraHandler(flagBurst, auraName, unitTag, start, finish, icon, ef -- buff on player, sort as passive, toggled or timed and add if (filterDisguisesOnPlayer and abilityType == ABILITY_TYPE_CHANGEAPPEARANCE) then return end -- is a disguise and they are filtered - if (start == finish) then -- toggled or passive + if (IsMajorEffect(abilityID)) then -- major buff on player + displayFrameRef[GROUP_PLAYER_MAJOR]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_MAJOR, (start == finish) and AURA_TYPE_PASSIVE or AURA_TYPE_TIMED, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) + elseif (IsMinorEffect(abilityID)) then -- minor buff on player + displayFrameRef[GROUP_PLAYER_MINOR]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_MINOR, (start == finish) and AURA_TYPE_PASSIVE or AURA_TYPE_TIMED, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) + elseif (start == finish) then -- toggled or passive if (IsToggledAura(abilityID)) then -- toggled displayFrameRef[GROUP_PLAYER_TOGGLED]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_TOGGLED, AURA_TYPE_TOGGLED, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) else -- passive displayFrameRef[GROUP_PLAYER_PASSIVE]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_PASSIVE, AURA_TYPE_PASSIVE, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) end else -- timed buff - if (IsMajorEffect(abilityID)) then -- major buff on player - displayFrameRef[GROUP_PLAYER_MAJOR]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_MAJOR, AURA_TYPE_TIMED, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) - elseif (IsMinorEffect(abilityID)) then -- minor buff on player - displayFrameRef[GROUP_PLAYER_MINOR]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_MINOR, AURA_TYPE_TIMED, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) - elseif ((finish - start) > shortBuffThreshold) then -- is considered a long duration buff + if ((finish - start) > shortBuffThreshold) then -- is considered a long duration buff displayFrameRef[GROUP_PLAYER_LONG]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_LONG, AURA_TYPE_TIMED, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) else displayFrameRef[GROUP_PLAYER_SHORT]:AddAuraToDisplay(flagBurst, GROUP_PLAYER_SHORT, AURA_TYPE_TIMED, auraName, unitTag, start, finish, icon, effectType, abilityType, abilityID) diff --git a/AuraData.lua b/AuraData.lua index 3a97a44..af6b075 100644 --- a/AuraData.lua +++ b/AuraData.lua @@ -171,6 +171,9 @@ local filterAlwaysIgnored = { [62587] = true, -- Focused Aim (2s Refreshing Aura) [42589] = true, -- Flawless Dawnbreaker (2s aura on Weaponswap) [40782] = true, -- Acid Spray (Extra Aura) + [26213] = true, -- Repentance (Minor Fortitude) + [26215] = true, -- Repentance (Minor Endurance) + [26216] = true, -- Repentance (Minor Intellect) } local filterAuraGroups = { @@ -181,12 +184,18 @@ local filterAuraGroups = { [11341] = true, -- Enemy Keep Bonus I [11343] = true, -- Enemy Keep Bonus II [11345] = true, -- Enemy Keep Bonus III + [11347] = true, -- Enemy Keep Bonus IV + [11348] = true, -- Enemy Keep Bonus V + [11350] = true, -- Enemy Keep Bonus VI + [11352] = true, -- Enemy Keep Bonus VII + [11353] = true, -- Enemy Keep Bonus VIII [12033] = true, -- Battle Spirit [15058] = true, -- Offensive Scroll Bonus I [15060] = true, -- Defensive Scroll Bonus I [16348] = true, -- Offensive Scroll Bonus II [16350] = true, -- Defensive Scroll Bonus II [39671] = true, -- Emperorship Alliance Bonus + [64210] = true, -- Increased Experience }, ['disguise'] = { -- intentionally empty table just so setup can iterate through filters more simply @@ -899,6 +908,7 @@ majorEffects = { [64166] = EFFECT_PROTECTION, [64251] = EFFECT_BREACH, [64254] = EFFECT_FRACTURE, + [64509] = EFFECT_SAVAGERY, [64562] = EFFECT_WARD, [64952] = EFFECT_SAVAGERY, [65133] = EFFECT_HEROISM, @@ -935,6 +945,9 @@ majorEffects = { [72657] = EFFECT_EXPEDITION, [72658] = EFFECT_EXPEDITION, [76044] = EFFECT_EXPEDITION, + [76420] = EFFECT_PROPHECY, + [76426] = EFFECT_SAVAGERY, + [76433] = EFFECT_PROPHECY, [76057] = EFFECT_PROPHECY, [76498] = EFFECT_EXPEDITION, [76499] = EFFECT_EXPEDITION, @@ -959,6 +972,7 @@ majorEffects = { [77082] = EFFECT_MENDING, [77918] = EFFECT_MENDING, [77922] = EFFECT_MENDING, + [77945] = EFFECT_PROPHECY, } diff --git a/Core.lua b/Core.lua index a3e2045..d269c88 100644 --- a/Core.lua +++ b/Core.lua @@ -2,7 +2,7 @@ Srendarr - Aura (Buff & Debuff) Tracker ---------------------------------------------------------- * - * Version 2.1.7 + * Version 2.1.8 * Kith, Garkin, silentgecko * * @@ -12,7 +12,7 @@ local L = Srendarr:GetLocale() Srendarr.name = 'Srendarr' Srendarr.slash = '/srendarr' -Srendarr.version = '2.1.7' +Srendarr.version = '2.1.8' Srendarr.versionDB = 3 Srendarr.displayFrames = {} diff --git a/Locales/Local_fr.lua b/Locales/Local_fr.lua index c22cad2..03d0b27 100644 --- a/Locales/Local_fr.lua +++ b/Locales/Local_fr.lua @@ -189,7 +189,7 @@ L.Filter_MundusBoonTargetTip = 'Choisissez de masquer l\'affichagedu bonus de la L.Filter_SoulSummons = 'Filtrer le timer du rez gratuit' L.Filter_SoulSummonsPlayerTip = 'Choisissez de masquer l\'affichage du timer de rez gratuit de la ligne Magie des Ames appliqué à vous-même.' L.Filter_SoulSummonsTargetTip = 'Choisissez de masquer l\'affichage du timer de rez gratuit de la ligne Magie des Ames appliqué à votre cible.' -L.Filter_VampLycan = 'Filtrer le timer Vampire & Loup-Garou' +L.Filter_VampLycan = 'Filtrer les buffs Vampire & Loup-Garou' L.Filter_VampLycanPlayerTip = 'Choisissez de masquer l\'affichage des buffs de vampirisme et de lycanthropie appliqué à vous-même.' L.Filter_VampLycanTargetTip = 'Choisissez de masquer l\'affichage des buffs de vampirisme et de lycanthropie appliqué à votre cible.' L.Filter_VampLycanBite = 'Filtrer le timer de morsure Vampire & Loup-Garou' diff --git a/Srendarr.txt b/Srendarr.txt index 8907e89..d8a5735 100644 --- a/Srendarr.txt +++ b/Srendarr.txt @@ -1,6 +1,6 @@ ## Title: |c67b1e9S|c4779ce'rendarr|r ## Description: Adds graphical tracking of buffs and debuffs on both yourself and others in a manner that meshes with the stock interface theme. -## Version: 2.1.7 +## Version: 2.1.8 ## Author: Kith, |cEFEBBEGarkin, silentgecko|r ## APIVersion: 100014 ## SavedVariables: SrendarrDB