Various Fixes./

extras/version.lua

@@ -1 +1 @@
-return { commitId = '4902a7c 2024-01-06' }
+return { commitId = '07a40d3 2024-01-06' }

modules/class.lua

@@ -255,8 +255,28 @@ function Module:DoGetState()
     -- Reture a reasonable state if queried
     local actionMap = "Action Map\n"
     actionMap = actionMap .. "-=-=-=-=-=\n"
-    for k, v in pairs(self.ResolvedActionMap) do
-        actionMap = actionMap .. string.format("%-20s ==> %s\n", k, (v.name or k))
+    for k, entry in pairs(self.ResolvedActionMap) do
+        local mappedAction = entry
+
+        if mappedAction then
+            if type(mappedAction) ~= "string" then
+                mappedAction = mappedAction.RankName()
+            end
+        else
+            if entry.type:lower() == "cmd" then
+                mappedAction = entry.cmd
+            elseif entry.type:lower() == "spell" then
+                mappedAction = "<Missing Spell>"
+            elseif entry.type:lower() == "ability" then
+                mappedAction = entry.name
+            elseif entry.type:lower() == "aa" then
+                mappedAction = entry.name
+            else
+                mappedAction = entry.name
+            end
+        end
+
+        actionMap = actionMap .. string.format("%-20s ==> %s\n", k, mappedAction)
     end
     local spellLoadout = "Spell Loadout\n-=-=-=-=-=-=-\n"
 

utils/rgmercs_utils.lua

@@ -674,8 +674,7 @@ function Utils.ExecEntry(e, targetId, map, bAllowMem)
 end
 
 function Utils.GetEntryConditionArg(map, entry)
-    local condArg = map[entry.name] or mq.TLO.Spell(entry.name)()
-
+    local condArg = map[entry.name] or mq.TLO.Spell(entry.name)
     if condArg == nil or entry.type:lower() == "aa" then
         condArg = entry.name
     end