diff --git a/Heimdall.lua b/Heimdall.lua index d5ada49..e6469d8 100644 --- a/Heimdall.lua +++ b/Heimdall.lua @@ -170,7 +170,12 @@ local function init() ---@field masterChannel string ---@field throttle number ---@field scale number - ---@field ttl number + ---@field tagTTL number + ---@field alertTTL number + ---@field combatTTL number + ---@field tagSound boolean + ---@field alertSound boolean + ---@field combatSound boolean --- Data --- ---@class HeimdallMessengerData @@ -338,7 +343,12 @@ local function init() masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "masterChannel" }, "Agent"), throttle = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "throttle" }, 10), scale = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "scale" }, 3), - ttl = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "ttl" }, 1), + tagTTL = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "tagTTL" }, 1), + alertTTL = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "alertTTL" }, 1), + combatTTL = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "combatTTL" }, 1), + tagSound = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "tagSound" }, false), + alertSound = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "alertSound" }, false), + combatSound = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "combatSound" }, false), }, } diff --git a/Modules/MinimapTagger.lua b/Modules/MinimapTagger.lua index 99d0f99..b95028e 100644 --- a/Modules/MinimapTagger.lua +++ b/Modules/MinimapTagger.lua @@ -10,7 +10,8 @@ function shared.MinimapTagger.Init() ---@param y number ---@param frame Frame ---@param scale number? - local function PlantFrame(x, y, frame, scale) + ---@param ttl number? + local function PlantFrame(x, y, frame, scale, ttl) scale = scale or 1 local w, h = BattlefieldMinimap:GetSize() w, h = w * BattlefieldMinimap:GetEffectiveScale(), h * BattlefieldMinimap:GetEffectiveScale() @@ -44,7 +45,7 @@ function shared.MinimapTagger.Init() self.custom.progress = 0 self:SetScript("OnUpdate", function(self, elapsed) self.custom.progress = self.custom.progress + elapsed - local progress = self.custom.progress / Heimdall_Data.config.minimapTagger.ttl + local progress = self.custom.progress / ttl if Heimdall_Data.config.minimapTagger.debug then print(string.format("[%s] Alert progress%%: %f", ModuleName, progress)) print(string.format("[%s] Alert progress: %f", ModuleName, self.custom.progress)) @@ -91,7 +92,7 @@ function shared.MinimapTagger.Init() end return end - PlantFrame(x, y, frame, scale) + PlantFrame(x, y, frame, scale, Heimdall_Data.config.minimapTagger.alertTTL) end ---@type Frame[] @@ -123,7 +124,7 @@ function shared.MinimapTagger.Init() end return end - PlantFrame(x, y, frame, scale) + PlantFrame(x, y, frame, scale, Heimdall_Data.config.minimapTagger.tagTTL) end ---@type Frame[] @@ -155,7 +156,7 @@ function shared.MinimapTagger.Init() end return end - PlantFrame(x, y, frame, scale) + PlantFrame(x, y, frame, scale, Heimdall_Data.config.minimapTagger.combatTTL) end local pauseUntil = 0