dave/wow-Heimdall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Rework main heimdall file to simplify config

Browse Source
This commit is contained in:
PhatPhuckDave
2025-01-01 14:04:48 +01:00
parent e1136703a5
commit 9ebc95885e
1 changed files with 47 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
Heimdall.lua
View File

@@ -1,32 +1,20 @@
local addonname, data = ... local addonname, shared = ...
---@cast data HeimdallData ---@cast shared HeimdallShared
---@cast addonname string ---@cast addonname string
-- TODO: Maybe make a configuration weakaura, make use of weakaura options...
-- TODO: Implement counting kills and display on whosniffer -- TODO: Implement counting kills and display on whosniffer
-- Take last N seconds of combatlog into account ie. count who does damage to who -- Take last N seconds of combatlog into account ie. count who does damage to who
-- Maybe even make an alert when someone does too much damage to someone else... -- Maybe even make an alert when someone does too much damage to someone else...
-- But that would not be trivial as of now, I can't think of a way to do it sensibly -- But that would not be trivial as of now, I can't think of a way to do it sensibly
-- TODO: Implement auto grouping via agent, maybe find "+" or something
-- TODO: Implement some sort of automatic grouping feature...
-- Don't know how to elect leader yet... Who invites?
-- Maybe we can just make it agent #6, have him always be the group leader?
local function init() local function init()
---@class Heimdall_Data ---@class Heimdall_Data
---@field who { data: table<string, Player> } ---@field config HeimdallConfig
---@field whitelist table<string, string> ---@field whitelist table<string, string>
---@field stinkies table<string, boolean> ---@field stinkies table<string, boolean>
---@field config HeimdallConfig
if not Heimdall_Data then Heimdall_Data = {} end if not Heimdall_Data then Heimdall_Data = {} end
if not Heimdall_Data.config then Heimdall_Data.config = {} end
-- We don't care about these persisting ---@class HeimdallShared
-- Actually we don't want some of them to persist
-- For those we DO we use (global) Heimdall_Data
---@class HeimdallData
---@field config HeimdallConfig
---@field raceMap table<string, string> ---@field raceMap table<string, string>
---@field classColors table<string, string> ---@field classColors table<string, string>
---@field messenger HeimdallMessengerData ---@field messenger HeimdallMessengerData
@@ -96,7 +84,7 @@ local function init()
---@field whoTicker number? ---@field whoTicker number?
---@field ignored table<string, boolean> ---@field ignored table<string, boolean>
data.GetOrDefault = function(table, keys, default) shared.GetOrDefault = function(table, keys, default)
local value = default local value = default
if not table then return value end if not table then return value end
if not keys then return value end if not keys then return value end
@@ -117,39 +105,31 @@ local function init()
return value return value
end end
data.messenger = { shared.messenger = {
queue = {} queue = {}
} }
data.who = { shared.who = {
ignored = {}, ignored = {},
} }
--/run Heimdall_Data.config = {inviter={enabled=false},deathReporter={enabled=false},spotter={enabled=false,everyone=false}}
--/run Heimdall_Data.config = {who={enabled=true},deathReporter={enabled=true},spotter={enabled=true}} Heimdall_Data.config = {
--/run Heimdall_Data.config = {deathReporter={enabled=false}}
--/run Heimdall_Data.config = {deathReporter={enabled=false},spotter={enabled=false}}
--/run Heimdall_Data.config = {deathReporter={enabled=false},spotter={enabled=true,everyone=false}}
--/run Heimdall_Data.config = {inviter={enabled=true},deathReporter={enabled=true},spotter={enabled=true,everyone=true}}
--/run Heimdall_Data.config = {inviter={enabled=true,keyword="+++"},deathReporter={enabled=true},spotter={enabled=true,everyone=true}}
--/run Heimdall_Data.config = {inviter={enabled=true,keyword="++"},deathReporter={enabled=true},spotter={enabled=true,everyone=false}}
--/run Heimdall_Data.config.who.enabled = true
data.config = {
spotter = { spotter = {
enabled = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "enabled" }, true), enabled = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "enabled" }, true),
everyone = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "everyone" }, false), everyone = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "everyone" }, false),
hostile = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "hostile" }, true), hostile = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "hostile" }, true),
alliance = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "alliance" }, true), alliance = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "alliance" }, true),
stinky = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "stinky" }, true), stinky = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "stinky" }, true),
notifyChannel = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "notifyChannel" }, "Agent"), notifyChannel = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "notifyChannel" }, "Agent"),
zoneOverride = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "zoneOverride" }, nil), zoneOverride = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "zoneOverride" }, nil),
throttleTime = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "throttleTime" }, 10) throttleTime = shared.GetOrDefault(Heimdall_Data, { "config", "spotter", "throttleTime" }, 10)
}, },
who = { who = {
enabled = data.GetOrDefault(Heimdall_Data, { "config", "who", "enabled" }, false), enabled = shared.GetOrDefault(Heimdall_Data, { "config", "who", "enabled" }, false),
ignored = data.GetOrDefault(Heimdall_Data, { "config", "who", "ignored" }, {}), ignored = shared.GetOrDefault(Heimdall_Data, { "config", "who", "ignored" }, {}),
notifyChannel = data.GetOrDefault(Heimdall_Data, { "config", "who", "notifyChannel" }, "Agent"), notifyChannel = shared.GetOrDefault(Heimdall_Data, { "config", "who", "notifyChannel" }, "Agent"),
ttl = data.GetOrDefault(Heimdall_Data, { "config", "who", "ttl" }, 20), ttl = shared.GetOrDefault(Heimdall_Data, { "config", "who", "ttl" }, 20),
doWhisper = data.GetOrDefault(Heimdall_Data, { "config", "who", "doWhisper" }, true), doWhisper = shared.GetOrDefault(Heimdall_Data, { "config", "who", "doWhisper" }, true),
zoneNotifyFor = data.GetOrDefault(Heimdall_Data, { "config", "who", "zoneNotifyFor" }, { zoneNotifyFor = shared.GetOrDefault(Heimdall_Data, { "config", "who", "zoneNotifyFor" }, {
["Orgrimmar"] = true, ["Orgrimmar"] = true,
["Thunder Bluff"] = true, ["Thunder Bluff"] = true,
["Undercity"] = true, ["Undercity"] = true,
@@ -159,96 +139,27 @@ local function init()
}), }),
}, },
messenger = { messenger = {
enabled = data.GetOrDefault(Heimdall_Data, { "config", "messenger", "enabled" }, true), enabled = shared.GetOrDefault(Heimdall_Data, { "config", "messenger", "enabled" }, true),
}, },
deathReporter = { deathReporter = {
enabled = data.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "enabled" }, false), enabled = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "enabled" }, false),
throttle = data.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "throttle" }, 10), throttle = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "throttle" }, 10),
doWhisper = data.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "doWhisper" }, true), doWhisper = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "doWhisper" }, true),
notifyChannel = data.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "notifyChannel" }, "Agent"), notifyChannel = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "notifyChannel" }, "Agent"),
zoneOverride = data.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "zoneOverride" }, nil), zoneOverride = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "zoneOverride" }, nil),
duelThrottle = data.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "duelThrottle" }, 5), duelThrottle = shared.GetOrDefault(Heimdall_Data, { "config", "deathReporter", "duelThrottle" }, 5),
}, },
whisperNotify = data.GetOrDefault(Heimdall_Data, { "config", "whisperNotify" }, { whisperNotify = shared.GetOrDefault(Heimdall_Data, { "config", "whisperNotify" }, { }),
"Extazyk", stinkies = shared.GetOrDefault(Heimdall_Data, { "config", "stinkies" }, { }),
"Smokefire",
"Smokemantra",
"Хихихантер",
"Муркот",
"Растафаркрай",
"Frosstmorn",
"Pulsjkee",
"Paskoo",
"发酸的风景画",
}),
stinkies = data.GetOrDefault(Heimdall_Data, { "config", "stinkies" }, {
["Ahhahahh"] = true,
["Aye"] = true,
["Bbd"] = true,
["Blessly"] = true,
["Bunkkeer"] = true,
["Calmer"] = true,
["Chuvirloeban"] = true,
["Clairvoyant"] = true,
["Dewdew"] = true,
["Dwxrfshaman"] = true,
["Ebanirot"] = true,
["Heger"] = true,
["Hmor"] = true,
["Joule"] = true,
["Kaøs"] = true,
["Kromsaevmode"] = true,
["Kugisara"] = true,
["Lax"] = true,
["Negron"] = true,
["Oakskin"] = true,
["Pizdosorkam"] = true,
["Pussymism"] = true,
["Rattenfenger"] = true,
["Riener"] = true,
["Rollbot"] = true,
["Samuraqt"] = true,
["Sekiiro"] = true,
["Shadowmilf"] = true,
["Sonikblaster"] = true,
["Srakonyh"] = true,
["Stuffo"] = true,
["Subaruwrxsti"] = true,
["Sukunexd"] = true,
["Tomoki"] = true,
["Unwashed"] = true,
["Voitas"] = true,
["Wataru"] = true,
["Yooshima"] = true,
["Анджелос"] = true,
["Артейда"] = true,
["Асталабиста"] = true,
["Гебефрени"] = true,
["Курлык"] = true,
["Лжедмитресса"] = true,
["Ловилуну"] = true,
["Лопапа"] = true,
["Неонанируй"] = true,
["Паладийпал"] = true,
["Психопаточка"] = true,
["Сильверлейн"] = true,
["Сосканереалк"] = true,
["Счастьевам"] = true,
["Фоська"] = true,
["Фрил"] = true,
["Ххантуля"] = true,
["Чмодвенк"] = true,
["Шпек"] = true,
}),
inviter = { inviter = {
enabled = data.GetOrDefault(Heimdall_Data, { "config", "inviter", "enabled" }, false), enabled = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "enabled" }, false),
listeningChannel = data.GetOrDefault(Heimdall_Data, { "config", "inviter", "listeningChannel" }, "Agent"), listeningChannel = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "listeningChannel" }, "Agent"),
keyword = data.GetOrDefault(Heimdall_Data, { "config", "inviter", "keyword" }, "+"), keyword = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "keyword" }, "+"),
whitelist = data.GetOrDefault(Heimdall_Data, { "config", "inviter", "whitelist" }, {}), whitelist = shared.GetOrDefault(Heimdall_Data, { "config", "inviter", "whitelist" }, {}),
} }
} }
data.raceMap = { shared.raceMap = {
["Orc"] = "Horde", ["Orc"] = "Horde",
["Undead"] = "Horde", ["Undead"] = "Horde",
["Tauren"] = "Horde", ["Tauren"] = "Horde",
@@ -272,7 +183,7 @@ local function init()
["Mag'har Orc"] = "Horde" ["Mag'har Orc"] = "Horde"
} }
data.classColors = { shared.classColors = {
["Warrior"] = "C69B6D", ["Warrior"] = "C69B6D",
["Paladin"] = "F48CBA", ["Paladin"] = "F48CBA",
["Hunter"] = "AAD372", ["Hunter"] = "AAD372",
@@ -289,7 +200,7 @@ local function init()
---@param input string ---@param input string
---@return number ---@return number
data.utf8len = function(input) shared.utf8len = function(input)
if not input then if not input then
return 0 return 0
end end
@@ -317,9 +228,9 @@ local function init()
---@param targetLength number ---@param targetLength number
---@param left boolean ---@param left boolean
---@return string ---@return string
data.padString = function(input, targetLength, left) shared.padString = function(input, targetLength, left)
left = left or false left = left or false
local len = data.utf8len(input) local len = shared.utf8len(input)
if len < targetLength then if len < targetLength then
if left then if left then
input = input .. string.rep(" ", targetLength - len) input = input .. string.rep(" ", targetLength - len)
@@ -330,11 +241,11 @@ local function init()
return input return input
end end
data.Whoer.Init() shared.Whoer.Init()
data.Messenger.Init() shared.Messenger.Init()
data.Spotter.Init() shared.Spotter.Init()
data.DeathReporter.Init() shared.DeathReporter.Init()
data.Inviter.Init() shared.Inviter.Init()
print("Heimdall loaded!") print("Heimdall loaded!")
end end
@@ -344,22 +255,4 @@ loadedFrame:SetScript("OnEvent", function(self, event, addonName)
if addonName == addonname then if addonName == addonname then
init() init()
end end
end) end)
local logoutFrame = CreateFrame("Frame")
logoutFrame:RegisterEvent("PLAYER_LOGOUT")
logoutFrame:SetScript("OnEvent", function(self, event)
Heimdall_Data.config.stinkies = data.config.stinkies
Heimdall_Data.config.inviter.whitelist = data.config.whitelist
end)
SlashCmdList["HEIMDALL_TOGGLE_STINKY"] = function(input)
print("Toggling stinky: " .. tostring(input))
if data.config.stinkies[input] then
data.config.stinkies[input] = nil
else
data.config.stinkies[input] = true
end
print(data.config.stinkies[input])
end
SLASH_HEIMDALL_TOGGLE_STINKY1 = "/has"