From d8296fb7d00a22cdc43ce8e80e1ac97f89857eee Mon Sep 17 00:00:00 2001 From: Moorea Tv Date: Thu, 30 May 2024 18:14:20 -0700 Subject: [PATCH] DF new toc, adding Cata instead of Wrath TOC, dropping BCC, and blind fix for reported lua error in GetTrain --- Mama/Mama-BCC.toc | 20 -------------------- Mama/{Mama-Wrath.toc => Mama-Cata.toc} | 4 ++-- Mama/Mama-Mainline.toc | 2 +- Mama/Mama.lua | 5 +++++ 4 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 Mama/Mama-BCC.toc rename Mama/{Mama-Wrath.toc => Mama-Cata.toc} (89%) diff --git a/Mama/Mama-BCC.toc b/Mama/Mama-BCC.toc deleted file mode 100644 index 33436c7..0000000 --- a/Mama/Mama-BCC.toc +++ /dev/null @@ -1,20 +0,0 @@ -## Interface: 20504 -## Title: M.A.M.A. -## Notes: |cFF99E5FFM|rooreaTv's/minimal yet |cFF99E5FFA|rwesome |cFF99E5FFM|rultiboxing |cFF99E5FFA|rssistant (|cFF99E5FF/mama|r) -## Notes: Burning Crusade Classic edition -## Author: MooreaTV moorea@ymail.com -## Version: @project-version@ -## DefaultState: Enabled -## LoadOnDemand: 0 -## SavedVariables: MamaSaved -## Dependencies: DynamicBoxer -## OptionalDeps: SexyMap, ProjectAzilroka -## Globe: check-classic -## X-OpenSource-License: LPGLv3 -## X-OpenSource-Releases: https://github.com/mooreatv/MAMA-multiboxing/releases -## X-Curse-Project-ID: 334197 -## X-Wago-ID: 7nGvmDKx -## X-WoWI-ID: 26337 -MoLib/MoLib.lua -MoLib/MoLibUI.lua -Mama.lua diff --git a/Mama/Mama-Wrath.toc b/Mama/Mama-Cata.toc similarity index 89% rename from Mama/Mama-Wrath.toc rename to Mama/Mama-Cata.toc index 39b53e1..abdd46a 100644 --- a/Mama/Mama-Wrath.toc +++ b/Mama/Mama-Cata.toc @@ -1,7 +1,7 @@ -## Interface: 30403 +## Interface: 40400 ## Title: M.A.M.A. ## Notes: |cFF99E5FFM|rooreaTv's/minimal yet |cFF99E5FFA|rwesome |cFF99E5FFM|rultiboxing |cFF99E5FFA|rssistant (|cFF99E5FF/mama|r) -## Notes: Wrath of the Lich King Classic Edition +## Notes: Cataclysm Classic Edition ## Author: MooreaTV moorea@ymail.com ## Version: @project-version@ ## DefaultState: Enabled diff --git a/Mama/Mama-Mainline.toc b/Mama/Mama-Mainline.toc index 3d733c4..527374a 100644 --- a/Mama/Mama-Mainline.toc +++ b/Mama/Mama-Mainline.toc @@ -1,4 +1,4 @@ -## Interface: 100206 +## Interface: 100207 ## Title: M.A.M.A. ## Notes: |cFF99E5FFM|rooreaTv's/minimal yet |cFF99E5FFA|rwesome |cFF99E5FFM|rultiboxing |cFF99E5FFA|rssistant (|cFF99E5FF/mama|r) ## Notes: Dragonflight edition diff --git a/Mama/Mama.lua b/Mama/Mama.lua index 7721c5e..6b1acc1 100644 --- a/Mama/Mama.lua +++ b/Mama/Mama.lua @@ -598,6 +598,11 @@ function MM:GetTrain() if MM:GetLead() == "player" then return "player" end + -- TODO fix this but for now all I have is a stack trace from 1 user and I can't reproduce so: + if not DB.watched or not DB.watched.slot then + MM:Warning("Strange init order issue, will not setup train macro properly yet, try Mama Lead again later") + return "player" + end local idx = ((DB.watched.slot+DB.expectedCount-2)%DB.expectedCount)+1 local fullName = DB.watched[idx] if fullName then