Merge branch 'release/0.22.7'

evil-morfar · Aug 5, 2024 · 20e4e55 · 20e4e55
2 parents 01e0bb5 + 3634c92
commit 20e4e55
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,5 +2,6 @@
 
 ### Bugfixes
 
-- *Actually implemented changes from v0.22.5.*
-- *Fixed rare issue with reloading as ML.*
+- *Fixed inconsistancies when adding council members, leading to characters with special first character not being registered on the council.*
+
+- *Druids no longer autopass polearms in Season of Discovery.*
diff --git a/Changelog_Complete.md b/Changelog_Complete.md
@@ -1,3 +1,13 @@
+# 0.22.7
+
+## Changes
+
+### Bugfixes
+
+- *Fixed inconsistancies when adding council members, leading to characters with special first character not being registered on the council.*
+
+- *Druids no longer autopass polearms in Season of Discovery.*
+
 # 0.22.6
 
 ## Changes

diff --git a/Core/Autopass.lua b/Core/Autopass.lua
@@ -46,8 +46,12 @@ local autopassTable = {
 }
 
 if Classic:IsClassicEra() then
-	-- Druids pass on polearms in Classic, but not WotLK
-	autopassTable[LE_ITEM_CLASS_WEAPON][LE_ITEM_WEAPON_POLEARM] = {"ROGUE", "SHAMAN", "PRIEST", "MAGE", "WARLOCK", "DRUID"}
+	-- Druids pass on polearms in Classic, but not WotLK (or SoD)
+	if Classic:IsSeasonOfDiscovery() then
+		autopassTable[LE_ITEM_CLASS_WEAPON][LE_ITEM_WEAPON_POLEARM] = { "ROGUE", "SHAMAN", "PRIEST", "MAGE", "WARLOCK" }
+	else
+		autopassTable[LE_ITEM_CLASS_WEAPON][LE_ITEM_WEAPON_POLEARM] = {"ROGUE", "SHAMAN", "PRIEST", "MAGE", "WARLOCK", "DRUID"}
+	end
 	-- From Cataclysm, all classes use their main gear type, which still may not be true in vanilla
 	autopassTable[LE_ITEM_CLASS_ARMOR][LE_ITEM_ARMOR_CLOTH]		= { }
 	autopassTable[LE_ITEM_CLASS_ARMOR][LE_ITEM_ARMOR_LEATHER] 	= {"PRIEST", "MAGE",    "WARLOCK"}

diff --git a/Core/Module.lua b/Core/Module.lua
@@ -163,4 +163,8 @@ end
 ---@return boolean #True if running Classic Era game
 function ClassicModule:IsClassicEra()
    return WOW_PROJECT_CLASSIC == WOW_PROJECT_ID
+end
+
+function ClassicModule:IsSeasonOfDiscovery()
+   return self:IsClassicEra() and C_Seasons.GetActiveSeason() == Enum.SeasonID.SeasonOfDiscovery
 end
diff --git a/RCLootCouncil b/RCLootCouncil
diff --git a/RCLootCouncil_Classic.toc b/RCLootCouncil_Classic.toc
@@ -1,9 +1,9 @@
 ## Author: Potdisc
-## Interface: 11502
+## Interface: 11503
 ## Interface-Cata: 40400
-## Notes: RCLootCouncil for WoW Classic and Cataclysm Classic v0.22.6
+## Notes: RCLootCouncil for WoW Classic and Cataclysm Classic v0.22.7
 ## Title: RCLootCouncil Classic
-## Version: 0.22.6
+## Version: 0.22.7
 ## X-Curse-Project-ID: 332955
 ## SavedVariables: RCLootCouncilDB, RCLootCouncilLootDB
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, lib-st, LibWindow-1.1, LibDialog-1.0
+1 −1		Core/Defaults.lua
+2 −2		Modules/options.lua
+1 −1		ml_core.lua