Skip to content

Commit

Permalink
Fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanzilla committed Jul 28, 2024
1 parent 0d7060a commit cc09dad
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 16 deletions.
17 changes: 11 additions & 6 deletions browser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,16 @@ local function TraceCVar(cvar, value, ...)
end
end
-- Ignore C_CVar.SetCVar hook if it originated from ourselves or CvarUtil.lua or ClassicCvarUtil.lua
if source and not (source:lower():find("[\\/]advancedinterfaceoptions[\\/]") or
source:lower():find("[_\\/]sharedxmlbase[\\/]cvarutil%.lua") or
source:lower():find("[_\\/]sharedxml[\\/]cvarutil%.lua") or
source:lower():find("[_\\/]sharedxml[\\/]classiccvarutil%.lua") or
source:lower():find("[_\\/]sharedxml[\\/]classic[\\/]classiccvarutil%.lua")) then
if
source
and not (
source:lower():find("[\\/]advancedinterfaceoptions[\\/]")
or source:lower():find("[_\\/]sharedxmlbase[\\/]cvarutil%.lua")
or source:lower():find("[_\\/]sharedxml[\\/]cvarutil%.lua")
or source:lower():find("[_\\/]sharedxml[\\/]classiccvarutil%.lua")
or source:lower():find("[_\\/]sharedxml[\\/]classic[\\/]classiccvarutil%.lua")
)
then
local realValue = GetCVar(cvar) -- the client does some conversions to the original value
if SVLoaded then
AdvancedInterfaceOptionsSaved.ModifiedCVars[cvar:lower()] = source .. ":" .. lineNum
Expand Down Expand Up @@ -139,7 +144,7 @@ function addon:PopulateCVarPanel(OptionsPanel)
self:ClearFocus()
end)
FilterBox:SetScript("OnEnterPressed", function(self)
self:SetAutoFocus(false) -- Clear focus when enter is pressed because ketho said so
self:SetAutoFocus(false) -- Clear focus when enter is pressed because Ketho said so
self:ClearFocus()
end)
FilterBox:SetScript("OnEditFocusGained", function(self)
Expand Down
23 changes: 22 additions & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,60 @@
"words": [
"ADDONCATEGORIES",
"Ambiguate",
"BGDL",
"BGSOUND",
"bspcache",
"Cata",
"cffaaaaff",
"cffaaffaa",
"cffffaaaa",
"cffffffff",
"cvar",
"cvars",
"daltonize",
"Debuff",
"Debuffs",
"DISPELLABLE",
"Dont",
"Dwmo",
"EROR",
"gpromote",
"GXAPI",
"hbao",
"Hostle",
"HRTF",
"Infov",
"Ketho",
"Lerp",
"Luacheck",
"MAXFPSBK",
"mmhhh",
"MSAA",
"Mult",
"Nagle",
"nebularg",
"NUMDIALOGS",
"PERC",
"PHONG",
"PPAA",
"RAIDSSAO",
"REGEN",
"simd",
"SOUNDFX",
"SSAO",
"TARGETOFTARGET",
"TIPOFTHEDAY",
"UBERTOOLTIPS",
"UISCALE",
"Unshift",
"upvalue",
"USEIPV",
"UVARINFO",
"uvars",
"vsync",
"WAGO",
"WOWI"
"WGOB",
"WOWI",
"WQST"
]
}
11 changes: 3 additions & 8 deletions cvars.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---@diagnostic disable: undefined-global
local addonName, addon = ...
local _G = _G
local _, addon = ...

addon.combatProtected = {
-- List of cvars that can't be modified in combat
Expand Down Expand Up @@ -235,13 +234,10 @@ addon.hiddenOptions = {
["advancedWatchFrame"] = { prettyName = ADVANCED_OBJECTIVES_TEXT, description = OPTION_TOOLTIP_ADVANCED_OBJECTIVES_TEXT, type = "" },
["watchFrameIgnoreCursor"] = { prettyName = OBJECTIVES_IGNORE_CURSOR_TEXT, description = OPTION_TOOLTIP_OBJECTIVES_IGNORE_CURSOR, type = "boolean" },
["guildMemberNotify"] = { prettyName = GUILDMEMBER_ALERT, description = OPTION_TOOLTIP_GUILDMEMBER_ALERT, type = "boolean" },
["showArenaEnemyFrames"] = { prettyName = SHOW_ARENA_ENEMY_FRAMES_TEXT, description = OPTION_TOOLTIP_SHOW_ARENA_ENEMY_FRAMES, type = "boolean" },
["autoClearAFK"] = { prettyName = nil, description = OPTION_TOOLTIP_CLEAR_AFK, type = "boolean" },
["colorblindWeaknessFactor"] = { prettyName = nil, description = OPTION_TOOLTIP_ADJUST_COLORBLIND_STRENGTH, type = "boolean" },
["autoLootDefault"] = { prettyName = nil, description = OPTION_TOOLTIP_AUTO_LOOT_DEFAULT, type = "boolean" },
["autoLootRate"] = { prettyName = "Auto Loot Rate", description = "Rate in milliseconds to tick auto loot", type = "number" },
["ChatAmbienceVolume"] = { prettyName = nil, description = "", type = "boolean" },
["threatShowNumeric"] = { prettyName = nil, description = OPTION_TOOLTIP_SHOW_NUMERIC_THREAT, type = "boolean" },
["rightActionBar"] = { prettyName = nil, description = OPTION_TOOLTIP_SHOW_MULTIBAR3, type = "boolean" },
["emphasizeMySpellEffects"] = { prettyName = nil, description = OPTION_TOOLTIP_EMPHASIZE_MY_SPELLS, type = "boolean" },
["chatBubblesParty"] = { prettyName = nil, description = OPTION_TOOLTIP_PARTY_CHAT_BUBBLES, type = "boolean" },
Expand Down Expand Up @@ -376,7 +372,6 @@ addon.hiddenOptions = {
["Sound_EnablePositionalLowPassFilter"] = { prettyName = ENABLE_SOFTWARE_HRTF, description = OPTION_TOOLTIP_ENABLE_SOFTWARE_HRTF, type = "boolean" },

["showTargetOfTarget"] = { prettyName = nil, description = OPTION_TOOLTIP_SHOW_TARGET_OF_TARGET, type = "boolean" },
["guildMemberNotify"] = { prettyName = nil, description = OPTION_TOOLTIP_GUILDMEMBER_ALERT, type = "boolean" },
["showTutorials"] = { prettyName = SHOW_TUTORIALS, description = OPTION_TOOLTIP_SHOW_TUTORIALS, type = "boolean" },
["lossOfControl"] = { prettyName = nil, description = OPTION_TOOLTIP_LOSS_OF_CONTROL, type = "boolean" },
["blockChannelInvites"] = { prettyName = nil, description = OPTION_TOOLTIP_BLOCK_CHAT_CHANNEL_INVITE, type = "boolean" },
Expand Down Expand Up @@ -685,7 +680,7 @@ addon.hiddenOptions = {
-- ["bloatTest"] = {},
-- ["bloatnameplates"] = {},
-- ["bloatthreat"] = {},
["bodyQuota"] = { description = "Maximum number of componented bodies seen at once" },
["bodyQuota"] = { description = "Maximum number of component bodies seen at once" },
["breakUpLargeNumbers"] = { description = "Toggles using commas in large numbers" },
["bspcache"] = { description = "BSP node caching" },
["calendarShowBattlegrounds"] = { description = "Whether Battleground holidays should appear in the calendar" },
Expand Down Expand Up @@ -1171,7 +1166,7 @@ function addon:GetCVars()
if
info.commandType == 0 -- cvar, rather than script
and info.category ~= 0 -- ignore debug category
and not strfind(info.command:lower(), "debug") -- a number of commands with "debug" in their name are inexplicibly not in the "debug" category
and not strfind(info.command:lower(), "debug") -- a number of commands with "debug" in their name are inexplicably not in the "debug" category
and info.category ~= 8 -- ignore GM category
and addon:CVarExists(info.command) -- real cvar?
then
Expand Down
2 changes: 1 addition & 1 deletion gui/CombatConfigPanel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function addon:CreateCombatOptions()
SpellQueueWindow = {
type = "range",
name = LAG_TOLERANCE,
desc = "Determines how far ahead of the 'end of a spell' start-recovery spell system can be, before allowing spell request to be sent to the server. Ie this controls the built-in lag for the ability queuing system. Ideally, you'll want to set this to your in-game latency.",
desc = "Determines how far ahead of the 'end of a spell' start-recovery spell system can be, before allowing spell request to be sent to the server. Ie this controls the built-in lag for the ability queuing system.",
min = 0,
max = 400,
step = 1,
Expand Down

0 comments on commit cc09dad

Please sign in to comment.