Mage Class about 75% completed

DerpleMQ2 · Jan 9, 2024 · 394e833 · 394e833
1 parent 11dc7f7
commit 394e833
Show file tree

Hide file tree

Showing 18 changed files with 775 additions and 183 deletions.
diff --git a/class_configs/mag_class_config.lua b/class_configs/mag_class_config.lua
diff --git a/class_configs/nec_class_config.lua b/class_configs/nec_class_config.lua
@@ -616,7 +616,7 @@ local _ClassConfig = {
                 cond = function(self)
                     return mq.TLO.Me.State():lower() == "feign" and (mq.TLO.Me.PctAggro() < 90 or mq.TLO.Me.TargetOfTarget.ID() ~= mq.TLO.Me.ID())
                 end,
-                cmd = function()
+                custom_func = function(_)
                     RGMercUtils.DoCmd("/stand")
                     return true
                 end,
@@ -905,7 +905,7 @@ local _ClassConfig = {
                 cond = function(self)
                     return mq.TLO.Me.State():lower() == "feign" and (mq.TLO.Me.PctAggro() < 90 or mq.TLO.Me.TargetOfTarget.ID() ~= mq.TLO.Me.ID())
                 end,
-                cmd = function()
+                custom_func = function(_)
                     RGMercUtils.DoCmd("/stand")
                     return true
                 end,

diff --git a/class_configs/rog_class_config.lua b/class_configs/rog_class_config.lua
@@ -478,7 +478,7 @@ return {
                 cond = function(self)
                     return self.settings.DoHideSneak
                 end,
-                cmd = function()
+                custom_func = function(_)
                     if mq.TLO.Me.AbilityReady("hide") then RGMercUtils.DoCmd("/doability hide") end
                     if mq.TLO.Me.AbilityReady("sneak") then RGMercUtils.DoCmd("/doability sneak") end
                     return true

diff --git a/class_configs/shd_class_config.lua b/class_configs/shd_class_config.lua
@@ -803,7 +803,7 @@ local _ClassConfig = {
                     return self.settings.DoBandolier and not mq.TLO.Me.Bandolier("Shield").Active() and
                         mq.TLO.Me.Bandolier("Shield").Index() and RGMercUtils.IsTanking()
                 end,
-                cmd = function()
+                custom_func = function(_)
                     RGMercUtils.DoCmd("/bandolier activate Shield")
                     return true
                 end,
@@ -817,7 +817,7 @@ local _ClassConfig = {
                     return self.settings.DoBandolier and not mq.TLO.Me.Bandolier("2HS").Active() and
                         mq.TLO.Me.Bandolier("2HS").Index() and not RGMercUtils.IsTanking()
                 end,
-                cmd = function()
+                custom_func = function(_)
                     RGMercUtils.DoCmd("/bandolier activate 2HS")
                     return true
                 end,

diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '30c2d5e 2024-01-08' }
+return { commitId = '11dc7f7 2024-01-08' }
diff --git a/init.lua b/init.lua
@@ -4,12 +4,12 @@ local GitCommit = require('extras.version')
 
 RGMercsBinds    = require('utils.rgmercs_binds')
 RGMercsEvents   = require('utils.rgmercs_events')
+RGMercsLogger   = require("utils.rgmercs_logger")
 RGMercConfig    = require('utils.rgmercs_config')
 RGMercConfig:LoadSettings()
 
 RGMercsConsole = nil
 
-local RGMercsLogger = require("utils.rgmercs_logger")
 RGMercsLogger.set_log_level(RGMercConfig:GetSettings().LogLevel)
 
 local RGMercUtils = require("utils.rgmercs_utils")

diff --git a/modules/basic.lua b/modules/basic.lua
@@ -1,6 +1,5 @@
 -- Sample Basic Class Module
 local mq                 = require('mq')
-local RGMercsLogger      = require("utils.rgmercs_logger")
 local RGMercUtils        = require("utils.rgmercs_utils")
 
 local Module             = { _version = '0.1a', _name = "Basic", _author = 'Derple', }

diff --git a/modules/class.lua b/modules/class.lua
@@ -1,8 +1,7 @@
 -- Sample Basic Class Module
-local mq            = require('mq')
-local RGMercsLogger = require("utils.rgmercs_logger")
-local RGMercUtils   = require("utils.rgmercs_utils")
-local Set           = require("mq.Set")
+local mq          = require('mq')
+local RGMercUtils = require("utils.rgmercs_utils")
+local Set         = require("mq.Set")
 require('utils.rgmercs_datatypes')
 
 local Module                              = { _version = '0.1a', _name = "Class", _author = 'Derple', }
@@ -33,6 +32,9 @@ end
 function Module:SaveSettings(doBroadcast)
     mq.pickle(getConfigFileName(), self.settings)
 
+    -- set dynamic names.
+    self:SetDynamicNames()
+
     if doBroadcast == true then
         RGMercUtils.BroadcastUpdate(self._name, "LoadSettings")
     end
@@ -104,9 +106,22 @@ function Module:Init()
 
     self.ModuleLoaded = true
 
+    -- set dynamic names.
+    self:SetDynamicNames()
+
     return { settings = self.settings, defaults = self.ClassConfig.DefaultConfig, categories = self.DefaultCategories, }
 end
 
+function Module:SetDynamicNames()
+    for _, data in pairs(self.ClassConfig.Rotations) do
+        for _, r in ipairs(data) do
+            if r.name_func then
+                r.name = r.name_func(self)
+            end
+        end
+    end
+end
+
 function Module:GetResolvedActionMapItem(item)
     if self.ReloadingLoadouts then return nil end
     return self.ResolvedActionMap[item]
@@ -216,6 +231,14 @@ function Module:GetHealRotationTable(mode)
     return self.ClassConfig and self.ClassConfig.HealRotations[mode] or {}
 end
 
+function Module:GetSetting(setting)
+    return self.ModuleLoaded and self.settings[setting] or ""
+end
+
+function Module:GetDefaultConfig(config)
+    return self.ModuleLoaded and self.ClassConfig[config] or nil
+end
+
 ---@return number
 function Module:GetClassModeId()
     return self.settings.Mode

diff --git a/modules/contributors.lua b/modules/contributors.lua
@@ -1,6 +1,5 @@
 -- Sample Basic Class Module
 local mq                 = require('mq')
-local RGMercsLogger      = require("utils.rgmercs_logger")
 local RGMercUtils        = require("utils.rgmercs_utils")
 
 local Module             = { _version = '0.1a', _name = "Contributors", _author = 'Derple', }

diff --git a/modules/movement.lua b/modules/movement.lua
@@ -1,6 +1,5 @@
 -- Sample Basic Class Module
 local mq                       = require('mq')
-local RGMercsLogger            = require("utils.rgmercs_logger")
 local RGMercUtils              = require("utils.rgmercs_utils")
 local ICONS                    = require('mq.Icons')
 local Set                      = require("mq.Set")

diff --git a/modules/performance.lua b/modules/performance.lua
@@ -1,6 +1,5 @@
 -- Sample Performance Monitor Class Module
 local mq              = require('mq')
-local RGMercsLogger   = require("utils.rgmercs_logger")
 local RGMercUtils     = require("utils.rgmercs_utils")
 local ImPlot          = require('ImPlot')
 local Set             = require('mq.Set')

diff --git a/modules/pull.lua b/modules/pull.lua
@@ -1,6 +1,5 @@
 -- Sample Pull Class Module
 local mq                          = require('mq')
-local RGMercsLogger               = require("utils.rgmercs_logger")
 local RGMercUtils                 = require("utils.rgmercs_utils")
 local Set                         = require("mq.Set")
 local ICONS                       = require('mq.Icons')

diff --git a/modules/travel.lua b/modules/travel.lua
@@ -1,6 +1,5 @@
 -- Sample Basic Class Module
 local mq                           = require('mq')
-local RGMercsLogger                = require("utils.rgmercs_logger")
 local RGMercUtils                  = require("utils.rgmercs_utils")
 
 local Module                       = { _version = '0.1a', _name = "Travel", _author = 'Derple', }

diff --git a/utils/rgmercs_binds.lua b/utils/rgmercs_binds.lua
@@ -1,10 +1,9 @@
-local mq            = require('mq')
-local RGMercUtils   = require("utils.rgmercs_utils")
-local RGMercsLogger = require("utils.rgmercs_logger")
+local mq          = require('mq')
+local RGMercUtils = require("utils.rgmercs_utils")
 
-local Bind          = { _version = '0.1a', _name = "RGMercsBinds", _author = 'Derple', }
+local Bind        = { _version = '0.1a', _name = "RGMercsBinds", _author = 'Derple', }
 
-Bind.MainHandler    = function(cmd, ...)
+Bind.MainHandler  = function(cmd, ...)
     if RGMercsBinds.Handlers[cmd] then
         return RGMercsBinds.Handlers[cmd].handler(...)
     end
@@ -20,7 +19,7 @@ Bind.MainHandler    = function(cmd, ...)
     end
 end
 
-Bind.Handlers       = {
+Bind.Handlers     = {
     ['qsay'] = {
         usage = "/rgl qsay <text>",
         about = "All RGMercs will target your target and say your <text>",

diff --git a/utils/rgmercs_config.lua b/utils/rgmercs_config.lua
@@ -1,6 +1,5 @@
 local mq                        = require('mq')
 local RGMercUtils               = require("utils.rgmercs_utils")
-local RGMercsLogger             = require("utils.rgmercs_logger")
 local Set                       = require("mq.Set")
 
 local Config                    = { _version = '0.5a', _subVersion = "2023 Larions Song!", _name = "RGMercs Lua Edition", _author = 'Derple, Morisato, Greyn', }
@@ -119,6 +118,7 @@ Config.DefaultConfig = {
     ['AllowMezBreak']     = { DisplayName = "Allow Mez Break", Category = "Combat", Tooltip = "Allow Mez Breaking.", Default = false, },
     ['InstantRelease']    = { DisplayName = "Instant Release", Category = "Combat", Tooltip = "Instantly release when you die.", Default = false, },
     ['DoAutoTarget']      = { DisplayName = "Auto Target", Category = "Combat", Tooltip = "Automatically change targets.", Default = true, },
+    ['DoAlliance']        = { DisplayName = "Do Alliance", Category = "Combat", Tooltip = "Automatically cast Alliance spells.", Default = true, },
     ['DoModRod']          = { DisplayName = "Do Mod Rod", Category = "Combat", Tooltip = "Auto use Mod Rods if we have them", Default = true, },
     ['StayOnTarget']      = { DisplayName = "Stay On Target", Category = "Combat", Tooltip = "Stick to your target. Default: true; Tank Mode Defaults: false. false allows intelligent target swapping based on aggro/named/ etc.", Default = (not Config.Constants.RGTank:contains(mq.TLO.Me.Class.ShortName())), },
     ['DoAutoEngage']      = { DisplayName = "Auto Engage", Category = "Combat", Tooltip = "Automatically engage targets.", Default = true, },

diff --git a/utils/rgmercs_events.lua b/utils/rgmercs_events.lua
@@ -1,7 +1,6 @@
-local mq            = require('mq')
-local RGMercUtils   = require("utils.rgmercs_utils")
-local RGMercsLogger = require("utils.rgmercs_logger")
-local Set           = require("mq.Set")
+local mq          = require('mq')
+local RGMercUtils = require("utils.rgmercs_utils")
+local Set         = require("mq.Set")
 
 mq.event("CantSee", "You cannot see your target.", function()
     if RGMercConfig.Globals.BackOffFlag then return end

diff --git a/utils/rgmercs_modules.lua b/utils/rgmercs_modules.lua
@@ -1,7 +1,5 @@
-local RGMercsLogger = require("utils.rgmercs_logger")
-
-local Module        = { _version = '0.1a', _author = 'Derple', }
-Module.__index      = Module
+local Module   = { _version = '0.1a', _author = 'Derple', }
+Module.__index = Module
 
 ---@return any
 function Module.load()