Skip to content

Commit d042218

Browse files
committed
fix: #2415 Revert "feat: Add "Only Important" filter to Spell Cast icon type (#2412)"
This reverts commit 69661ee.
1 parent de35eb0 commit d042218

4 files changed

Lines changed: 6 additions & 23 deletions

File tree

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
## v12.0.12
2-
* Added Only Important filter to Spell Cast icon type
32
* Added "Addon Restriction Active" condition (#2414) - checks if any selected restriction types (Combat, Encounter, Challenge Mode, PvP, Map, Chat) are active.
43
* Fix #2410 - Buff/Debuff icons rarely failing to emit a duration object
54
* Fix #2423 - Player stats and similar are now secret

Components/IconTypes/IconType_cast/cast.lua

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ Type:RegisterIconDefaults{
6363

6464
-- True if the icon should display blanks instead of the pocketwatch texture.
6565
NoPocketwatch = false,
66-
67-
-- True if the icon should only check casts of spells flagged as important.
68-
OnlyImportant = false,
6966
}
7067

7168
if not TMW.clientHasSecrets then
@@ -98,20 +95,13 @@ Type:RegisterConfigPanel_ConstructorFunc(150, "TellMeWhen_CastSettings", functio
9895
noPocketwatch,
9996
})
10097
else
101-
local checks = {
98+
self:BuildSimpleCheckSettingFrame({
10299
function(check)
103100
check:SetTexts(L["ICONMENU_ONLYINTERRUPTIBLE"], L["ICONMENU_ONLYINTERRUPTIBLE_DESC"])
104101
check:SetSetting("Interruptible")
105102
end,
106103
noPocketwatch,
107-
}
108-
if TMW.clientHasSecrets then
109-
checks[#checks + 1] = function(check)
110-
check:SetTexts(L["ICONMENU_ONLYIMPORTANT"], L["ICONMENU_ONLYIMPORTANT_DESC"])
111-
check:SetSetting("OnlyImportant")
112-
end
113-
end
114-
self:BuildSimpleCheckSettingFrame(checks)
104+
})
115105
end
116106
end)
117107

@@ -154,10 +144,9 @@ end
154144

155145
local Cast_OnUpdate
156146
if TMW.clientHasSecrets then
157-
local IsSpellImportant = C_Spell.IsSpellImportant
158147
function Cast_OnUpdate_Secrets(icon, time)
159148
-- Upvalue things that will be referenced a lot in our loops.
160-
local Units, Interruptible, OnlyImportant = icon.Units, icon.Interruptible, icon.OnlyImportant
149+
local Units, Interruptible = icon.Units, icon.Interruptible
161150

162151
for u = 1, #Units do
163152
local unit = Units[u]
@@ -166,21 +155,20 @@ if TMW.clientHasSecrets then
166155
local GUID = UnitGUID(unit)
167156
if GUID then
168157

169-
local name, _, iconTexture, start, endTime, _, _, notInterruptible, castingSpellID = UnitCastingInfo(unit)
158+
local name, _, iconTexture, start, endTime, _, _, notInterruptible = UnitCastingInfo(unit)
170159
local durObj = name and UnitCastingDuration(unit)
171160
-- Reverse is used to reverse the timer sweep masking behavior. Regular casts should have it be false.
172161
local reverse = false
173162

174163
-- There is no regular spellcast. Check for a channel.
175164
if not name then
176-
name, _, iconTexture, start, endTime, _, notInterruptible, castingSpellID = UnitChannelInfo(unit)
165+
name, _, iconTexture, start, endTime, _, notInterruptible = UnitChannelInfo(unit)
177166
durObj = name and UnitChannelDuration(unit)
178167
-- Channeled casts should reverse the timer sweep behavior.
179168
reverse = true
180169
end
181170

182-
local isImportant = not OnlyImportant or (castingSpellID and IsSpellImportant(castingSpellID))
183-
if name and isImportant then
171+
if name then
184172
icon.LastTexture = iconTexture
185173

186174
local state

Localization/TellMeWhen-enUS.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,9 +538,6 @@ L["ICONMENU_ONSUCCEED"] = "On Succeed"
538538
L["ICONMENU_ONLYINTERRUPTIBLE"] = "Only Interruptible"
539539
L["ICONMENU_ONLYINTERRUPTIBLE_DESC"] = "Check this box to only show spell casts that are interruptible"
540540

541-
L["ICONMENU_ONLYIMPORTANT"] = "Only Important"
542-
L["ICONMENU_ONLYIMPORTANT_DESC"] = "Check this box to only show spell casts that Blizzard flags as important"
543-
544541
L["ICONMENU_NOPOCKETWATCH"] = "Blank Texture for Unknown"
545542
L["ICONMENU_NOPOCKETWATCH_DESC"] = "Check this box to show no texture instead of the Pocketwatch texture."
546543

Options/CHANGELOG.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ TMW.CHANGELOG_LASTVER="10.0.0"
44

55
TMW.CHANGELOG = [==[
66
## v12.0.12
7-
* Added Only Important filter to Spell Cast icon type
87
* Added "Addon Restriction Active" condition (#2414) - checks if any selected restriction types (Combat, Encounter, Challenge Mode, PvP, Map, Chat) are active.
98
* Fix #2410 - Buff/Debuff icons rarely failing to emit a duration object
109
* Fix #2423 - Player stats and similar are now secret

0 commit comments

Comments
 (0)