Skip to content

Commit 34e46ab

Browse files
committed
#1844 - The Totem icon type has been updated for Monks to better support the wide range of "totems" that Monks have.
1 parent 7149132 commit 34e46ab

File tree

4 files changed

+31
-42
lines changed

4 files changed

+31
-42
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* #1811 - The group/target point of a group will now be preserved when moving a shrunk group via click-and-drag.
55
### Bug Fixes
66
* #1840 - Talents granted by Torghast powers are now correctly reflected by the Talent Learned condition.
7+
* #1844 - The Totem icon type has been updated for Monks to better support the wide range of "totems" that Monks have.
78

89
## v9.0.3
910
### Bug Fixes

Components/Core/Spells/Spells.lua

Lines changed: 28 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,33 @@ TMW:MakeSingleArgFunctionCached(TMW, "EquivToTable")
504504
-- Constant spell data
505505
---------------------------------
506506

507+
local genericTotemSlots = {
508+
{
509+
hasVariableNames = true,
510+
name = L["GENERICTOTEM"]:format(1),
511+
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
512+
},
513+
{
514+
hasVariableNames = true,
515+
name = L["GENERICTOTEM"]:format(2),
516+
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
517+
},
518+
{
519+
hasVariableNames = true,
520+
name = L["GENERICTOTEM"]:format(3),
521+
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
522+
},
523+
{
524+
hasVariableNames = true,
525+
name = L["GENERICTOTEM"]:format(4),
526+
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
527+
},
528+
{
529+
hasVariableNames = true,
530+
name = L["GENERICTOTEM"]:format(5),
531+
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
532+
},
533+
}
507534

508535
if pclass == "DRUID" then
509536
TMW.COMMON.CurrentClassTotems = {
@@ -542,22 +569,6 @@ elseif pclass == "PALADIN" then
542569
texture = GetSpellTexture(114158)
543570
}
544571
}
545-
elseif pclass == "MONK" then
546-
TMW.COMMON.CurrentClassTotems = {
547-
name = L["ICONMENU_STATUE"],
548-
desc = L["ICONMENU_TOTEM_GENERIC_DESC"]:format(L["ICONMENU_STATUE"]),
549-
{
550-
hasVariableNames = false,
551-
name = L["ICONMENU_STATUE"],
552-
texture = function()
553-
if GetSpecialization() == 1 then
554-
return GetSpellTexture(163177) -- black ox
555-
else
556-
return GetSpellTexture(115313) -- jade serpent
557-
end
558-
end,
559-
}
560-
}
561572
elseif pclass == "DEATHKNIGHT" then
562573
local npcName = function(npcID)
563574
local cachedName = TMW:TryGetNPCName(npcID)
@@ -588,30 +599,6 @@ else
588599
TMW.COMMON.CurrentClassTotems = {
589600
name = L["ICONMENU_TOTEM"],
590601
desc = L["ICONMENU_TOTEM_DESC"],
591-
{
592-
hasVariableNames = true,
593-
name = L["GENERICTOTEM"]:format(1),
594-
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
595-
},
596-
{
597-
hasVariableNames = true,
598-
name = L["GENERICTOTEM"]:format(2),
599-
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
600-
},
601-
{
602-
hasVariableNames = true,
603-
name = L["GENERICTOTEM"]:format(3),
604-
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
605-
},
606-
{
607-
hasVariableNames = true,
608-
name = L["GENERICTOTEM"]:format(4),
609-
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
610-
},
611-
{
612-
hasVariableNames = true,
613-
name = L["GENERICTOTEM"]:format(5),
614-
texture = "Interface\\ICONS\\ability_shaman_tranquilmindtotem"
615-
},
616602
}
603+
TMW:CopyTableInPlaceUsingDestinationMeta(genericTotemSlots, TMW.COMMON.CurrentClassTotems, true)
617604
end

Options/CHANGELOG.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ TMW.CHANGELOG = [==[
99
* #1811 - The group/target point of a group will now be preserved when moving a shrunk group via click-and-drag.
1010
### Bug Fixes
1111
* #1840 - Talents granted by Torghast powers are now correctly reflected by the Talent Learned condition.
12+
* #1844 - The Totem icon type has been updated for Monks to better support the wide range of "totems" that Monks have.
1213
1314
## v9.0.3
1415
### Bug Fixes

TellMeWhen.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ elseif strmatch(projectVersion, "%-%d+%-") then
4444
end
4545

4646
TELLMEWHEN_VERSION_FULL = TELLMEWHEN_VERSION .. " " .. TELLMEWHEN_VERSION_MINOR
47-
TELLMEWHEN_VERSIONNUMBER = 90401 -- NEVER DECREASE THIS NUMBER (duh?). IT IS ALSO ONLY INTERNAL (for versioning of)
47+
TELLMEWHEN_VERSIONNUMBER = 90402 -- NEVER DECREASE THIS NUMBER (duh?). IT IS ALSO ONLY INTERNAL (for versioning of)
4848

4949
TELLMEWHEN_FORCECHANGELOG = 86005 -- if the user hasn't seen the changelog until at least this version, show it to them.
5050

0 commit comments

Comments
 (0)