diff --git a/Heimdall.lua b/Heimdall.lua index 4e3949d..3e55294 100644 --- a/Heimdall.lua +++ b/Heimdall.lua @@ -80,7 +80,6 @@ local function init() ---@field networkMessenger HeimdallNetworkMessengerConfig ---@field configurator HeimdallConfiguratorConfig ---@field stinkyCache HeimdallStinkyCacheConfig - ---@field essencex HeimdallEssencexConfig ---@field whisperNotify table ---@field addonPrefix string ---@field stinkies table @@ -253,17 +252,6 @@ local function init() ---@field commander string ---@field ttl number - ---@class HeimdallEssencexConfig - ---@field enabled boolean - ---@field debug boolean - ---@field masterChannel string - ---@field who boolean - ---@field spotter boolean - --/run Heimdall_Data.config.essencex.masterChannel="EssenceAgent" - --/run Heimdall_Data.config.essencex.enabled=true - --/run Heimdall_Data.config.essencex.spotter=true - --/run Heimdall_Data.config.essencex.who=true - --- Data --- ---@class HeimdallMessengerData ---@field queue table @@ -514,13 +502,6 @@ local function init() commander = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyCache", "commander" }, "Heimdállr"), ttl = shared.GetOrDefault(Heimdall_Data, { "config", "stinkyCache", "ttl" }, 10), }, - essencex = { - enabled = shared.GetOrDefault(Heimdall_Data, { "config", "essencex", "enabled" }, false), - debug = shared.GetOrDefault(Heimdall_Data, { "config", "essencex", "debug" }, false), - masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "essencex", "masterChannel" }, "Essencex"), - who = shared.GetOrDefault(Heimdall_Data, { "config", "essencex", "who" }, false), - spotter = shared.GetOrDefault(Heimdall_Data, { "config", "essencex", "spotter" }, false), - }, addonPrefix = shared.GetOrDefault(Heimdall_Data, { "config", "addonPrefix" }, "HEIMDALL"), } diff --git a/Modules/Spotter.lua b/Modules/Spotter.lua index b301f07..cd133b7 100644 --- a/Modules/Spotter.lua +++ b/Modules/Spotter.lua @@ -218,14 +218,6 @@ function shared.Spotter.Init() string.format("%s (%s)", ruZone or zone, ruSubzone or subzone), tostring(GetCurrentMapAreaID()), x * 100, y * 100) - if Heimdall_Data.config.essencex.spotter and Heimdall_Data.config.essencex.enabled then - local msg = { - channel = "C", - data = Heimdall_Data.config.essencex.masterChannel, - message = text - } - table.insert(shared.messenger.queue, msg) - end if Heimdall_Data.config.spotter.debug then print(string.format("[%s] Sending notification: %s", ModuleName, text)) diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua index 9f55519..2610dd8 100644 --- a/Modules/Whoer.lua +++ b/Modules/Whoer.lua @@ -341,16 +341,6 @@ function shared.Whoer.Init() data = Heimdall_Data.config.who.notifyChannel .. "ru", message = player:NotifyRu() } - if Heimdall_Data.config.essencex.who and Heimdall_Data.config.essencex.enabled then - if player.guild == "БеспредеЛ" then - if Heimdall_Data.config.who.debug then - print(string.format("[%s] Sending Russian message to %s", ModuleName, - Heimdall_Data.config.essencex.masterChannel)) - end - ruMsg.data = Heimdall_Data.config.essencex.masterChannel - table.insert(shared.messenger.queue, ruMsg) - end - end --table.insert(shared.messenger.queue, ruMsg) table.insert(shared.networkMessenger.queue, ruMsg) end @@ -401,12 +391,6 @@ function shared.Whoer.Init() } --table.insert(shared.messenger.queue, msg) table.insert(shared.networkMessenger.queue, msg) - if Heimdall_Data.config.essencex.who and Heimdall_Data.config.essencex.enabled then - if player.guild == "БеспредеЛ" then - msg.data = Heimdall_Data.config.essencex.masterChannel - table.insert(shared.messenger.queue, msg) - end - end if Heimdall_Data.config.who.doWhisper then for _, name in pairs(Heimdall_Data.config.whisperNotify) do @@ -462,12 +446,6 @@ function shared.Whoer.Init() } --table.insert(shared.messenger.queue, msg) table.insert(shared.networkMessenger.queue, msg) - if Heimdall_Data.config.essencex.who and Heimdall_Data.config.essencex.enabled then - if player.guild == "БеспредеЛ" then - msg.data = Heimdall_Data.config.essencex.masterChannel - table.insert(shared.messenger.queue, msg) - end - end if Heimdall_Data.config.who.doWhisper then for _, name in pairs(Heimdall_Data.config.whisperNotify) do