#1844 - The Totem icon type has been updated for Monks to better supp…

…ort the wide range of "totems" that Monks have.
ascott18 · Jan 17, 2021 · 34e46ab · 34e46ab
1 parent 7149132
commit 34e46ab
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * #1811 - The group/target point of a group will now be preserved when moving a shrunk group via click-and-drag.
 ### Bug Fixes
 * #1840 - Talents granted by Torghast powers are now correctly reflected by the Talent Learned condition.
+* #1844 - The Totem icon type has been updated for Monks to better support the wide range of "totems" that Monks have.
 
 ## v9.0.3
 ### Bug Fixes

diff --git a/Components/Core/Spells/Spells.lua b/Components/Core/Spells/Spells.lua
@@ -504,6 +504,33 @@ TMW:MakeSingleArgFunctionCached(TMW, "EquivToTable")
 -- Constant spell data
 ---------------------------------
 
+local genericTotemSlots = {
+	{
+		hasVariableNames = true,
+		name = L["GENERICTOTEM"]:format(1),
+		texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
+	},
+	{
+		hasVariableNames = true,
+		name = L["GENERICTOTEM"]:format(2),
+		texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
+	},
+	{
+		hasVariableNames = true,
+		name = L["GENERICTOTEM"]:format(3),
+		texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
+	},
+	{
+		hasVariableNames = true,
+		name = L["GENERICTOTEM"]:format(4),
+		texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
+	},
+	{
+		hasVariableNames = true,
+		name = L["GENERICTOTEM"]:format(5),
+		texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
+	},
+}
 
 if pclass == "DRUID" then
 	TMW.COMMON.CurrentClassTotems = {
@@ -542,22 +569,6 @@ elseif pclass == "PALADIN" then
             texture = GetSpellTexture(114158)
         }
 	}
-elseif pclass == "MONK" then
-	TMW.COMMON.CurrentClassTotems = {
-		name = L["ICONMENU_STATUE"],
-		desc = L["ICONMENU_TOTEM_GENERIC_DESC"]:format(L["ICONMENU_STATUE"]),
-		{
-			hasVariableNames = false,
-			name = L["ICONMENU_STATUE"],
-			texture = function()
-				if GetSpecialization() == 1 then
-					return GetSpellTexture(163177) -- black ox
-				else
-					return GetSpellTexture(115313) -- jade serpent
-				end
-			end,
-		}
-	}
 elseif pclass == "DEATHKNIGHT" then
 	local npcName = function(npcID)
 		local cachedName = TMW:TryGetNPCName(npcID)
@@ -588,30 +599,6 @@ else
 	TMW.COMMON.CurrentClassTotems = {
 		name = L["ICONMENU_TOTEM"],
 		desc = L["ICONMENU_TOTEM_DESC"],
-		{
-			hasVariableNames = true,
-			name = L["GENERICTOTEM"]:format(1),
-			texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
-		},
-		{
-			hasVariableNames = true,
-			name = L["GENERICTOTEM"]:format(2),
-			texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
-		},
-		{
-			hasVariableNames = true,
-			name = L["GENERICTOTEM"]:format(3),
-			texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
-		},
-		{
-			hasVariableNames = true,
-			name = L["GENERICTOTEM"]:format(4),
-			texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
-		},
-		{
-			hasVariableNames = true,
-			name = L["GENERICTOTEM"]:format(5),
-			texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
-		},
 	}
+	TMW:CopyTableInPlaceUsingDestinationMeta(genericTotemSlots, TMW.COMMON.CurrentClassTotems, true)
 end
diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
@@ -9,6 +9,7 @@ TMW.CHANGELOG = [==[
 * #1811 - The group/target point of a group will now be preserved when moving a shrunk group via click-and-drag.
 ### Bug Fixes
 * #1840 - Talents granted by Torghast powers are now correctly reflected by the Talent Learned condition.
+* #1844 - The Totem icon type has been updated for Monks to better support the wide range of "totems" that Monks have.
 
 ## v9.0.3
 ### Bug Fixes

diff --git a/TellMeWhen.lua b/TellMeWhen.lua
@@ -44,7 +44,7 @@ elseif strmatch(projectVersion, "%-%d+%-") then
 end
 
 TELLMEWHEN_VERSION_FULL = TELLMEWHEN_VERSION .. " " .. TELLMEWHEN_VERSION_MINOR
-TELLMEWHEN_VERSIONNUMBER = 90401 -- NEVER DECREASE THIS NUMBER (duh?).  IT IS ALSO ONLY INTERNAL (for versioning of)
+TELLMEWHEN_VERSIONNUMBER = 90402 -- NEVER DECREASE THIS NUMBER (duh?).  IT IS ALSO ONLY INTERNAL (for versioning of)
 
 TELLMEWHEN_FORCECHANGELOG = 86005 -- if the user hasn't seen the changelog until at least this version, show it to them.