From 550e11b4886114f336c1a48c32ac7972ecee4b7f Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Sun, 26 Jan 2025 16:27:43 +0100 Subject: [PATCH] Rework all "masterChannel" and so to "channels" (list) --- Heimdall.lua | 58 +++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/Heimdall.lua b/Heimdall.lua index 87412a9..8ca2bad 100644 --- a/Heimdall.lua +++ b/Heimdall.lua @@ -86,6 +86,7 @@ local function init() ---@field agents table ---@field scale number ---@field notes table + ---@field channelLocale table ---@field locale string ---@field echoToRussian boolean ---@field debug boolean @@ -97,7 +98,7 @@ local function init() ---@field hostile boolean ---@field alliance boolean ---@field stinky boolean - ---@field notifyChannel string + ---@field channels string[] ---@field zoneOverride string? ---@field throttleTime number @@ -105,7 +106,7 @@ local function init() ---@field enabled boolean ---@field debug boolean ---@field ignored table - ---@field notifyChannel string + ---@field channels string[] ---@field ttl number ---@field doWhisper boolean ---@field zoneNotifyFor table @@ -121,14 +122,14 @@ local function init() ---@field debug boolean ---@field throttle number ---@field doWhisper boolean - ---@field masterChannel string + ---@field channels string[] ---@field zoneOverride string? ---@field duelThrottle number ---@class HeimdallInviterConfig ---@field enabled boolean ---@field debug boolean - ---@field listeningChannel string + ---@field channels string[] ---@field keyword string ---@field allAssist boolean ---@field agentsAssist boolean @@ -149,18 +150,18 @@ local function init() ---@class HeimdallAgentTrackerConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@class HeimdallEmoterConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@field prefix string ---@class HeimdallEchoerConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@field prefix string ---@class HeimdallMacroerConfig @@ -171,24 +172,24 @@ local function init() ---@class HeimdallCommanderConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@field commander string ---@field commands table ---@class HeimdallStinkyTrackerConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@class HeimdallCombatAlerterConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@class HeimdallSnifferConfig ---@field enabled boolean ---@field debug boolean - ---@field notifyChannel string + ---@field channels string[] ---@field throttle number ---@field zoneOverride string? ---@field stinky boolean @@ -196,7 +197,7 @@ local function init() ---@class HeimdallMinimapTaggerConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@field throttle number ---@field scale number ---@field tagTTL number @@ -223,13 +224,13 @@ local function init() ---@class HeimdallBonkDetectorConfig ---@field enabled boolean ---@field debug boolean - ---@field notifyChannel string + ---@field channels string[] ---@field throttle number ---@class HeimdallNoterConfig ---@field enabled boolean ---@field debug boolean - ---@field masterChannel string + ---@field channels string[] ---@class HeimdallNetworkConfig ---@field enabled boolean @@ -313,7 +314,7 @@ local function init() hostile = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "hostile" }, true), alliance = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "alliance" }, true), stinky = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "stinky" }, true), - notifyChannel = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "notifyChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "channels" }, {"Agent"}), zoneOverride = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "zoneOverride" }, nil), throttleTime = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "throttleTime" }, 10) }, @@ -321,7 +322,7 @@ local function init() enabled = shared.GetOrDefault(Heimdall_Data, { "config", "who", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "who", "debug" }, false), ignored = shared.GetOrDefault(Heimdall_Data, { "config", "who", "ignored" }, {}), - notifyChannel = shared.GetOrDefault(Heimdall_Data, { "config", "who", "notifyChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "who", "channels" }, {"Agent"}), ttl = shared.GetOrDefault(Heimdall_Data, { "config", "who", "ttl" }, 20), doWhisper = shared.GetOrDefault(Heimdall_Data, { "config", "who", "doWhisper" }, true), zoneNotifyFor = shared.GetOrDefault(Heimdall_Data, { "config", "who", "zoneNotifyFor" }, { @@ -344,14 +345,14 @@ local function init() debug = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "debug" }, false), throttle = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "throttle" }, 10), doWhisper = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "doWhisper" }, true), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "channels" }, {"Agent"}), zoneOverride = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "zoneOverride" }, nil), duelThrottle = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "duelThrottle" }, 5), }, inviter = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "debug" }, false), - listeningChannel = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "listeningChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "channels" }, {"Agent"}), keyword = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "keyword" }, "+"), allAssist = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "allAssist" }, false), agentsAssist = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "agentsAssist" }, false), @@ -372,18 +373,18 @@ local function init() agentTracker = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "agentTracker", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "agentTracker", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "agentTracker", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "agentTracker", "channels" }, {"Agent"}), }, emoter = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "emoter", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "emoter", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "emoter", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "emoter", "channels" }, {"Agent"}), prefix = shared.GetOrDefault(Heimdall_Data, { "config", "emoter", "prefix" }, ""), }, echoer = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "echoer", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "echoer", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "echoer", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "echoer", "channels" }, {"Agent"}), prefix = shared.GetOrDefault(Heimdall_Data, { "config", "echoer", "prefix" }, ""), }, macroer = { @@ -395,19 +396,19 @@ local function init() commander = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "channels" }, {"Agent"}), commander = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "commander" }, "Heimdállr"), commands = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "commands" }, {}), }, stinkyTracker = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyTracker", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyTracker", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyTracker", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyTracker", "channels" }, {"Agent"}), }, combatAlerter = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "combatAlerter", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "combatAlerter", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "combatAlerter", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "combatAlerter", "channels" }, {"Agent"}), }, messageDelegator = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "messageDelegator", "enabled" }, false), @@ -418,7 +419,7 @@ local function init() sniffer = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "sniffer", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "sniffer", "debug" }, false), - notifyChannel = shared.GetOrDefault(Heimdall_Data, { "config", "sniffer", "notifyChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "sniffer", "channels" }, {"Agent"}), throttle = shared.GetOrDefault(Heimdall_Data, { "config", "sniffer", "throttle" }, 10), zoneOverride = shared.GetOrDefault(Heimdall_Data, { "config", "sniffer", "zoneOverride" }, nil), stinky = shared.GetOrDefault(Heimdall_Data, { "config", "sniffer", "stinky" }, true), @@ -426,7 +427,7 @@ local function init() minimapTagger = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "channels" }, { "Agent" }), throttle = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "throttle" }, 10), scale = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "scale" }, 3), tagTTL = shared.GetOrDefault(Heimdall_Data, { "config", "minimapTagger", "tagTTL" }, 1), @@ -472,13 +473,13 @@ local function init() bonkDetector = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "bonkDetector", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "bonkDetector", "debug" }, false), - notifyChannel = shared.GetOrDefault(Heimdall_Data, { "config", "bonkDetector", "notifyChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "bonkDetector", "channels" }, {"Agent"}), throttle = shared.GetOrDefault(Heimdall_Data, { "config", "bonkDetector", "throttle" }, 5), }, noter = { enabled = shared.GetOrDefault(Heimdall_Data, { "config", "noter", "enabled" }, false), debug = shared.GetOrDefault(Heimdall_Data, { "config", "noter", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "noter", "masterChannel" }, "Agent"), + channels = shared.GetOrDefault(Heimdall_Data, { "config", "noter", "channels" }, {"Agent"}), lastNotes = shared.GetOrDefault(Heimdall_Data, { "config", "noter", "lastNotes" }, 5), }, network = { @@ -503,6 +504,7 @@ local function init() ttl = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyCache", "ttl" }, 10), }, addonPrefix = shared.GetOrDefault(Heimdall_Data, { "config", "addonPrefix" }, "HEIMDALL"), + channelLocale = shared.GetOrDefault(Heimdall_Data, { "config", "channelLocale" }, {}), } shared.raceMap = {