From b43166be76d1ab68ea6eadaee3197c29f2c7f9a2 Mon Sep 17 00:00:00 2001 From: 4n0n <4n0n@tinkr.site> Date: Thu, 31 Aug 2023 16:44:11 -0500 Subject: [PATCH] Era --- src/AuraTable/AuraTable.lua | 12 ++++++------ src/Unit/Unit.lua | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/AuraTable/AuraTable.lua b/src/AuraTable/AuraTable.lua index b7e7a2c..3874e05 100644 --- a/src/AuraTable/AuraTable.lua +++ b/src/AuraTable/AuraTable.lua @@ -118,7 +118,7 @@ end -- Get a units buffs ---@return nil function AuraTable:GetUnitBuffs() - if Tinkr.classic then + if Tinkr.classic or Tinkr.era then for i = 1, 40 do local aura = Bastion.Aura:New(self.unit, i, 'HELPFUL') @@ -157,7 +157,7 @@ end -- Get a units debuffs ---@return nil function AuraTable:GetUnitDebuffs() - if Tinkr.classic then + if Tinkr.classic or Tinkr.era then for i = 1, 40 do local aura = Bastion.Aura:New(self.unit, i, 'HARMFUL') @@ -279,7 +279,7 @@ function AuraTable:Find(spell) if a:IsUp() then -- Handle expired and non refreshed dropoffs not coming in UNIT_AURA return a else - if not Tinkr.classic then + if not Tinkr.classic or Tinkr.era then self:RemoveInstanceID(a:GetAuraInstanceID()) end end @@ -305,7 +305,7 @@ function AuraTable:FindMy(spell) if a:IsUp() then -- Handle expired and non refreshed dropoffs not coming in UNIT_AURA return a else - if not Tinkr.classic then + if not Tinkr.classic or Tinkr.era then self:RemoveInstanceID(a:GetAuraInstanceID()) end end @@ -334,7 +334,7 @@ function AuraTable:FindFrom(spell, source) return a end else - if not Tinkr.classic then + if not Tinkr.classic or Tinkr.era then self:RemoveInstanceID(a:GetAuraInstanceID()) end end @@ -362,7 +362,7 @@ function AuraTable:FindTheirs(spell) return a end else - if not Tinkr.classic then + if not Tinkr.classic or Tinkr.era then self:RemoveInstanceID(a:GetAuraInstanceID()) end end diff --git a/src/Unit/Unit.lua b/src/Unit/Unit.lua index 581a964..d9cd4ef 100644 --- a/src/Unit/Unit.lua +++ b/src/Unit/Unit.lua @@ -596,7 +596,7 @@ end ---@param unit Unit | nil ---@return number function Unit:GetComboPoints(unit) - if Tinkr.classic then + if Tinkr.classic or Tinkr.era then if not unit then return 0 end @@ -607,7 +607,7 @@ end ---@return number function Unit:GetComboPointsMax() - if Tinkr.classic then + if Tinkr.classic or Tinkr.era then return 5 end return UnitPowerMax(self:GetOMToken(), 4) @@ -617,7 +617,7 @@ end ---@param unit Unit | nil ---@return number function Unit:GetComboPointsDeficit(unit) - if Tinkr.classic then + if Tinkr.classic or Tinkr.era then return self:GetComboPointsMax() - self:GetComboPoints(unit) end return self:GetComboPointsMax() - self:GetComboPoints()