diff --git a/api/config.lua b/api/config.lua index 533caa8c..cdaee246 100644 --- a/api/config.lua +++ b/api/config.lua @@ -879,6 +879,7 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("thirdparty", "bcs", "enable", "1") pfUI:UpdateConfig("thirdparty", "crafty", "enable", "1") pfUI:UpdateConfig("thirdparty", "clevermacro", "enable", "1") + pfUI:UpdateConfig("thirdparty", "supercleveroidmacros", "enable", "1") pfUI:UpdateConfig("thirdparty", "flightmap", "enable", "1") pfUI:UpdateConfig("thirdparty", "sheepwatch", "enable", "1") pfUI:UpdateConfig("thirdparty", "totemtimers", "enable", "1") diff --git a/modules/gui.lua b/modules/gui.lua index c9713580..715bd35d 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -2426,6 +2426,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function () CreateConfig(nil, "BetterCharacterStats", C.thirdparty.bcs, "enable", "checkbox", nil, nil, nil, nil, "vanilla") CreateConfig(nil, "Crafty", C.thirdparty.crafty, "enable", "checkbox", nil, nil, nil, nil, "vanilla") CreateConfig(nil, "CleverMacro", C.thirdparty.clevermacro, "enable", "checkbox", nil, nil, nil, nil, "vanilla") + CreateConfig(nil, "SuperCleveRoidMacros", C.thirdparty.supercleveroidmacros, "enable", "checkbox", nil, nil, nil, nil, "vanilla") CreateConfig(nil, "AckisRecipeList", C.thirdparty.ackis, "enable", "checkbox", nil, nil, nil, nil, "tbc") CreateConfig(nil, "SheepWatch", C.thirdparty.sheepwatch, "enable", "checkbox", nil, nil, nil, nil, "tbc") CreateConfig(nil, "TotemTimers", C.thirdparty.totemtimers, "enable", "checkbox", nil, nil, nil, nil, "tbc") diff --git a/modules/macrotweak.lua b/modules/macrotweak.lua index 73bfa5bb..f6c4cd50 100644 --- a/modules/macrotweak.lua +++ b/modules/macrotweak.lua @@ -1,4 +1,7 @@ pfUI:RegisterModule("macrotweak", "vanilla", function () + -- disable macrotweak when SuperCleveRoidMacros is loaded + if IsAddOnLoaded("SuperCleveRoidMacros") then return end + -- do not write macro calls into chat input history if ChatFrameEditBox._AddHistoryLine then local userinput diff --git a/modules/thirdparty-vanilla.lua b/modules/thirdparty-vanilla.lua index 482f3e60..4cd82fec 100644 --- a/modules/thirdparty-vanilla.lua +++ b/modules/thirdparty-vanilla.lua @@ -927,6 +927,15 @@ pfUI:RegisterModule("thirdparty-vanilla", "vanilla", function() end) end) + -- SuperCleveRoidMacros + HookAddonOrVariable("SuperCleveRoidMacros", function() + if C.thirdparty.supercleveroidmacros.enable == "0" then return end + if not pfUI.bars then return end + + -- disable pfUI macro scanning + pfUI.bars.skip_macro = true + end) + HookAddonOrVariable("AtlasLoot", function() if C.thirdparty.atlasloot.enable == "0" then return end