fix #2119: switch to LibRangeCheck-3.0 that handles new Blizzard rang…

…e check
ascott18 · Nov 18, 2023 · c62ff5f · c62ff5f
1 parent 7e9c885
commit c62ff5f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 13 deletions.
diff --git a/.pkgmeta b/.pkgmeta
@@ -17,8 +17,7 @@ externals:
     Lib/LibSpellRange-1.0: https://github.com/ascott18/LibSpellRange-1.0.git
     Lib/LibOO-1.0: https://github.com/ascott18/LibOO-1.0.git
 
-    Lib/LibRangeCheck-2.0: svn://svn.wowace.com/wow/librangecheck-2-0/mainline/trunk/LibRangeCheck-2.0
-    Lib/LibRangeCheck-2.0-WA: https://github.com/WeakAuras/LibRangeCheck-2.0
+    Lib/LibRangeCheck-3.0: https://github.com/WeakAuras/LibRangeCheck-3.0
 
     Lib/AceAddon-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0
     Lib/AceEvent-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceEvent-3.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v10.2.0
+* Workaround #2114 - Most textures become Avenging Wrath when Avenging Wrath is glyphed.
+* Fix #2119 - handle Blizzard's new, poorly-introduced range check restrictions.
+
 ## v10.1.6
 * Support for WoW Classic Era 1.14.4. The classic era codebase has been merged into the main codebase, so some features that don't support classic may be present in a non-working state.
 

diff --git a/Components/Core/Conditions/Categories/UnitAttributes.lua b/Components/Core/Conditions/Categories/UnitAttributes.lua
@@ -253,7 +253,7 @@ ConditionCategory:RegisterCondition(8.5,  "LIBRANGECHECK", {
 	max = 100,
 	defaultUnit = "target",
 	formatter = TMW.C.Formatter:New(function(val)
-		local LRC = LibStub("LibRangeCheck-2.0")
+		local LRC = LibStub("LibRangeCheck-3.0")
 		if not LRC then
 			return val
 		end
@@ -290,9 +290,9 @@ ConditionCategory:RegisterCondition(8.5,  "LIBRANGECHECK", {
 	end,
 
 	funcstr = function(c, parent)
-		Env.LibRangeCheck = LibStub("LibRangeCheck-2.0")
+		Env.LibRangeCheck = LibStub("LibRangeCheck-3.0")
 		if not Env.LibRangeCheck then
-			TMW:Error("The %s condition requires LibRangeCheck-2.0", L["CNDT_RANGE"])
+			TMW:Error("The %s condition requires LibRangeCheck-3.0", L["CNDT_RANGE"])
 			return "false"
 		end
 

diff --git a/Localization/TellMeWhen-enUS.lua b/Localization/TellMeWhen-enUS.lua
@@ -1761,7 +1761,7 @@ L["ABSORBAMT"] = "Absorbtion shield amount"
 L["ABSORBAMT_DESC"] = "Checks the total amount of absorbtion shields that the unit has."
 
 L["CNDT_RANGE"] = "Unit Range"
-L["CNDT_RANGE_DESC"] = "Checks the approximate range of a unit using LibRangeCheck-2.0. Condition will evaluate to false if the unit does not exist."
+L["CNDT_RANGE_DESC"] = "Checks the approximate range of a unit using LibRangeCheck-3.0. Condition will evaluate to false if the unit does not exist."
 L["CNDT_RANGE_PRECISE"] = "%d yds. (|cff00c322Precise|r)"
 L["CNDT_RANGE_IMPRECISE"] = "%d yds. (|cffff1300Imprecise|r)"
 

diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
@@ -3,6 +3,10 @@ if not TMW then return end
 TMW.CHANGELOG_LASTVER="7.4.0"
 
 TMW.CHANGELOG = [==[
+## v10.2.0
+* Workaround #2114 - Most textures become Avenging Wrath when Avenging Wrath is glyphed.
+* Fix #2119 - handle Blizzard's new, poorly-introduced range check restrictions.
+
 ## v10.1.6
 * Support for WoW Classic Era 1.14.4. The classic era codebase has been merged into the main codebase, so some features that don't support classic may be present in a non-working state.
 

diff --git a/TellMeWhen-Classic.toc b/TellMeWhen-Classic.toc
@@ -34,11 +34,11 @@
 ## Notes-ruRU: Визуальные, звуковые и текстовые оповещения о готовности заклинаний, способностей, наличии баффов\дебаффов и многого другого.
 ## Notes-esES: Proporciona notificaciones visuales, auditivas y textuales sobre tiempos de reutilización, ventajas y básicamente cualquier otra cosa. 
 
-## OptionalDeps: Masque, Ace3, OmniCC, tullaCC, sct, sctd, MikScrollingBattleText, Parrot, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-2.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0, ElvUI, DBM-Core, BigWigs, LibClassicCasterino
+## OptionalDeps: Masque, Ace3, OmniCC, tullaCC, sct, sctd, MikScrollingBattleText, Parrot, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-3.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0, ElvUI, DBM-Core, BigWigs, LibClassicCasterino
 # The per character settings are the old settings, but we still need them to upgrade to the new ones. If they aren't defined, then they will be deleted immediately
 ## SavedVariablesPerCharacter: TellMeWhen_Settings
 ## SavedVariables: TellMeWhenDB
-## X-Embeds: LibStub, Ace3, LibSharedMedia-3.0, LibDataBroker-1.1, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-2.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0
+## X-Embeds: LibStub, Ace3, LibSharedMedia-3.0, LibDataBroker-1.1, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-3.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0
 ## X-Category: Combat
 
 Lib\LibClassicCasterino\LibClassicCasterino.lua

diff --git a/TellMeWhen-Wrath.toc b/TellMeWhen-Wrath.toc
@@ -35,11 +35,11 @@
 ## Notes-ruRU: Визуальные, звуковые и текстовые оповещения о готовности заклинаний, способностей, наличии баффов\дебаффов и многого другого.
 ## Notes-esES: Proporciona notificaciones visuales, auditivas y textuales sobre tiempos de reutilización, ventajas y básicamente cualquier otra cosa. 
 
-## OptionalDeps: Masque, Ace3, OmniCC, tullaCC, sct, sctd, MikScrollingBattleText, Parrot, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-2.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0, ElvUI, DBM-Core, BigWigs
+## OptionalDeps: Masque, Ace3, OmniCC, tullaCC, sct, sctd, MikScrollingBattleText, Parrot, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-3.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0, ElvUI, DBM-Core, BigWigs
 # The per character settings are the old settings, but we still need them to upgrade to the new ones. If they aren't defined, then they will be deleted immediately
 ## SavedVariablesPerCharacter: TellMeWhen_Settings
 ## SavedVariables: TellMeWhenDB
-## X-Embeds: LibStub, Ace3, LibSharedMedia-3.0, LibDataBroker-1.1, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-2.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0
+## X-Embeds: LibStub, Ace3, LibSharedMedia-3.0, LibDataBroker-1.1, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-3.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0
 ## X-Category: Combat
 
 includes.xml

diff --git a/TellMeWhen.toc b/TellMeWhen.toc
@@ -33,11 +33,11 @@
 ## Notes-ruRU: Визуальные, звуковые и текстовые оповещения о готовности заклинаний, способностей, наличии баффов\дебаффов и многого другого.
 ## Notes-esES: Proporciona notificaciones visuales, auditivas y textuales sobre tiempos de reutilización, ventajas y básicamente cualquier otra cosa. 
 
-## OptionalDeps: Masque, Ace3, OmniCC, tullaCC, sct, sctd, MikScrollingBattleText, Parrot, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-2.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0, ElvUI, DBM-Core, BigWigs
+## OptionalDeps: Masque, Ace3, OmniCC, tullaCC, sct, sctd, MikScrollingBattleText, Parrot, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-3.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0, ElvUI, DBM-Core, BigWigs
 # The per character settings are the old settings, but we still need them to upgrade to the new ones. If they aren't defined, then they will be deleted immediately
 ## SavedVariablesPerCharacter: TellMeWhen_Settings
 ## SavedVariables: TellMeWhenDB
-## X-Embeds: LibStub, Ace3, LibSharedMedia-3.0, LibDataBroker-1.1, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-2.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0
+## X-Embeds: LibStub, Ace3, LibSharedMedia-3.0, LibDataBroker-1.1, DRList-1.0, LibDogTag-3.0, LibDogTag-Unit-3.0, LibDogTag-Stats-3.0, LibSpellRange-1.0, LibOO-1.0, LibRangeCheck-3.0, LibBabble-CreatureType-3.0, LibBabble-Race-3.0
 ## X-Category: Combat
 
 includes.xml

diff --git a/includes.xml b/includes.xml
@@ -24,7 +24,7 @@
 <Include file="Lib\LibDogTag-Unit-3.0\lib.xml" />
 <Include file="Lib\LibDogTag-Stats-3.0\lib.xml" />
 <Include file="Lib\LibSpellRange-1.0\lib.xml" />
-<Script file="Lib\LibRangeCheck-2.0\LibRangeCheck-2.0.lua" />
+<Script file="Lib\LibRangeCheck-3.0\LibRangeCheck-3.0.lua" />
 <Include file="Lib\LibBabble-CreatureType-3.0\lib.xml" />
 <Include file="Lib\LibBabble-Race-3.0\lib.xml" />