Merge pull request #188 from aurelion314/master

New feature: Native Macros

MegaMacro.toc

@@ -1,4 +1,4 @@
-## Interface: 100000
+## Interface: 100205
 ## Title: Mega Macro
 ## Author: Sellorio
 ## Version: 1.0.0

src/config.lua

@@ -3,6 +3,7 @@ function MegaMacro_InitialiseConfig()
         MegaMacroGlobalData = {
             Activated = false,
             Macros = {},
+            InactiveMacros = {},
             Classes = {}
         }
     end
@@ -14,6 +15,12 @@ function MegaMacro_InitialiseConfig()
             Specializations = {}
         }
     end
+
+    if MegaMacroConfig == nil then
+        MegaMacroConfig = {
+            UseNativeActionBar = true,
+        }
+    end
 end
 
 function MegaMacroConfig_IsWindowDialog()
@@ -24,4 +31,5 @@ function MegaMacroConfig_GetWindowPosition()
     if MegaMacroGlobalData.WindowInfo then
         return MegaMacroGlobalData.WindowInfo.RelativePoint, MegaMacroGlobalData.WindowInfo.X, MegaMacroGlobalData.WindowInfo.Y
     end
-end
+end
+

src/constants.lua

@@ -4,8 +4,9 @@ MacroLimits = {
 	PerClassCount = 30,
 	PerSpecializationCount = 30,
 	-- limit: 18 character specific macro slots
-	PerCharacterCount = 8,
-	PerCharacterSpecializationCount = 10,
+	PerCharacterCount = 18,
+	PerCharacterSpecializationCount = 0,
+	InactiveCount = 160,
 	MaxGlobalMacros = 120,
 	MaxCharacterMacros = 18
 }
@@ -16,6 +17,7 @@ MacroIndexOffsets = {
 	PerSpecialization = MacroLimits.GlobalCount + MacroLimits.PerClassCount,
 	PerCharacter = MacroLimits.GlobalCount + MacroLimits.PerClassCount + MacroLimits.PerSpecializationCount,
 	PerCharacterSpecialization = MacroLimits.GlobalCount + MacroLimits.PerClassCount + MacroLimits.PerSpecializationCount + MacroLimits.PerCharacterCount,
+	Inactive = MacroLimits.GlobalCount + MacroLimits.PerClassCount + MacroLimits.PerSpecializationCount + MacroLimits.PerCharacterCount + MacroLimits.PerCharacterSpecializationCount,
 	NativeCharacterMacros = 120
 }
 
@@ -41,6 +43,7 @@ PetActionTextures = {
 MegaMacroTexture = 134400
 MegaMacroActiveStanceTexture = 136116
 MegaMacroCodeMaxLength = 1023
+MegaMacroCodeMaxLengthForNative = 250
 HighestMaxMacroCount = math.max(MacroLimits.GlobalCount, MacroLimits.PerClassCount, MacroLimits.PerSpecializationCount, MacroLimits.PerCharacterCount, MacroLimits.PerCharacterSpecializationCount)
 
 MegaMacroInfoFunctions = {

src/engine/mega-macro-action-bar-engine.lua

@@ -278,6 +278,10 @@ local function UpdateRange(button, functions, abilityId, target)
 end
 
 local function UpdateActionBar(button, macroId)
+	if MegaMacroConfig['UseNativeActionBar'] then
+		return
+	end
+
     local data = MegaMacroIconEvaluator.GetCachedData(macroId)
     local functions = MegaMacroInfoFunctions.Unknown
 
@@ -312,6 +316,9 @@ local function UpdateActionBar(button, macroId)
 end
 
 local function ResetActionBar(button)
+	if MegaMacroConfig['UseNativeActionBar'] then
+		return
+	end
 	button:SetChecked(false)
 	button.Count:SetText("")
 	button.Border:Hide() -- reset eqipped border