new range for unitframes

Author: kodewdle

Diff for: ElvUI/Core/Defaults/Global.lua

@@ -125,8 +125,8 @@ G.datatexts = {
 G.nameplates = {}
 
 G.unitframe = {
-	aurafilters = {},
 	aurawatch = {},
+	aurafilters = {},
 	raidDebuffIndicator = {
 		instanceFilter = 'RaidDebuffs',
 		otherFilter = 'CCDebuffs'
@@ -140,6 +140,119 @@ G.unitframe = {
 		yOffset = 0,
 		justifyH = 'CENTER',
 		attachTextTo = 'Health'
+	},
+	rangeCheck = {
+		FRIENDLY = {
+			DEATHKNIGHT = {},
+			DEMONHUNTER = {},
+			DRUID = {
+				['8936'] = 'Regrowth'
+			},
+			EVOKER = {
+				['355913'] = 'Emerald Blossom'
+			},
+			HUNTER = {},
+			MAGE = {
+				['1459'] = 'Arcane Intellect'
+			},
+			MONK = {
+				['116670'] = 'Vivify'
+			},
+			PALADIN = {
+				['85673'] = 'Word of Glory'
+			},
+			PRIEST = {
+				['17'] = E.Retail and 'Power Word: Shield' or nil,
+				['2050'] = not E.Retail and 'Lesser Heal' or nil
+			},
+			ROGUE = {
+				['36554'] = E.Retail and 'Shadowstep' or nil,
+				['921'] = E.Retail and 'Pick Pocket' or nil
+			},
+			SHAMAN = {
+				['8004'] = 'Healing Surge'
+			},
+			WARLOCK = {
+				['5697'] = 'Unending Breath'
+			},
+			WARRIOR = {}
+		},
+		ENEMY = {
+			DEATHKNIGHT = {
+				['49576'] = 'Death Grip'
+			},
+			DEMONHUNTER = {
+				['278326'] = 'Consume Magic'
+			},
+			DRUID = {
+				['8921'] = 'Moonfire'
+			},
+			EVOKER = {
+				['362969'] = 'Azure Strike'
+			},
+			HUNTER = {
+				['75'] = 'Auto Shot'
+			},
+			MAGE = {
+				['2139'] = 'Counterspell'
+			},
+			MONK = {
+				['115546'] = 'Provoke'
+			},
+			PALADIN = {
+				['20473'] = 'Holy Shock',
+				['20271'] = 'Judgement'
+			},
+			PRIEST = {
+				['589'] = 'Shadow Word: Pain'
+			},
+			ROGUE = {
+				['36554'] = 'Shadowstep'
+			},
+			SHAMAN = {
+				['8042'] = 'Earth Shock',
+				['188196'] = E.Retail and 'Lightning Bolt' or nil,
+				['403'] = not E.Retail and 'Lightning Bolt' or nil
+			},
+			WARLOCK = {
+				['234153'] = E.Retail and 'Drain Life' or nil,
+				['348'] = not E.Retail and 'Immolate' or nil,
+			},
+			WARRIOR = {
+				['355'] = 'Taunt'
+			}
+		},
+		RESURRECT = {
+			DEATHKNIGHT = {
+				['61999'] = 'Raise Ally'
+			},
+			DEMONHUNTER = {},
+			DRUID = {
+				['50769'] = 'Revive'
+			},
+			EVOKER = {
+				['361227'] = 'Return'
+			},
+			HUNTER = {},
+			MAGE = {},
+			MONK = {
+				['115178'] = 'Resuscitate'
+			},
+			PALADIN = {
+				['7328'] = 'Redemption'
+			},
+			PRIEST = {
+				['2006'] = 'Resurrection'
+			},
+			ROGUE = {},
+			SHAMAN = {
+				['2008'] = 'Ancestral Spirit'
+			},
+			WARLOCK = {
+				['20707'] = not E.Classic and 'Soulstone' or nil
+			},
+			WARRIOR = {}
+		}
 	}
 }
 

Diff for: ElvUI/Core/General/Tags.lua

@@ -3,7 +3,6 @@ local NP = E:GetModule('NamePlates')
 local ElvUF = E.oUF
 local Tags = ElvUF.Tags
 
-local RangeCheck = E.Libs.RangeCheck
 local Translit = E.Libs.Translit
 local translitMark = '!'
 
@@ -239,26 +238,6 @@ end
 --	Looping
 ------------------------------------------------------------------------
 
-for _, vars in ipairs({'',':min',':max'}) do
-	E:AddTag(format('range%s', vars), 0.1, function(unit)
-		if UnitIsConnected(unit) and not UnitIsUnit(unit, 'player') then
-			local minRange, maxRange = RangeCheck:GetRange(unit, true)
-
-			if vars == ':min' then
-				if minRange then
-					return format('%d', minRange)
-				end
-			elseif vars == ':max' then
-				if maxRange then
-					return format('%d', maxRange)
-				end
-			elseif minRange or maxRange then
-				return format('%s - %s', minRange or '??', maxRange or '??')
-			end
-		end
-	end)
-end
-
 for textFormat in pairs(E.GetFormattedTextStyles) do
 	local tagFormat = strlower(gsub(textFormat, '_', '-'))
 	E:AddTag(format('health:%s', tagFormat), 'UNIT_HEALTH UNIT_MAXHEALTH UNIT_CONNECTION PLAYER_FLAGS_CHANGED', function(unit)
@@ -1658,9 +1637,6 @@ E.TagInfo = {
 		['quest:full'] = { category = 'Quest', description = "Quest full" },
 		['quest:text'] = { category = 'Quest', description = "Quest text" },
 	-- Range
-		['range'] = { category = 'Range', description = "Displays the range" },
-		['range:min'] = { category = 'Range', description = "Displays the min range" },
-		['range:max'] = { category = 'Range', description = "Displays the max range" },
 		['distance'] = { category = 'Range', description = "Displays the distance" },
 		['nearbyplayers:4'] = { category = 'Range', description = "Displays all players within 4 yards" },
 		['nearbyplayers:8'] = { category = 'Range', description = "Displays all players within 8 yards" },

Diff for: ElvUI/Core/Modules/UnitFrames/Elements/Range.lua

@@ -1,54 +1,114 @@
 local E, L, V, P, G = unpack(ElvUI)
 local UF = E:GetModule('UnitFrames')
-local RangeCheck = E.Libs.RangeCheck
 
-local UnitCanAttack = UnitCanAttack
+local next = next
+local tonumber = tonumber
+
+local UnitInPhase = UnitInPhase
 local UnitInRange = UnitInRange
-local UnitIsConnected = UnitIsConnected
 local UnitIsPlayer = UnitIsPlayer
-local UnitIsUnit = UnitIsUnit
-local UnitInPhase = UnitInPhase
+local UnitCanAttack = UnitCanAttack
+local UnitIsConnected = UnitIsConnected
+local UnitIsDeadOrGhost = UnitIsDeadOrGhost
+local IsSpellKnownOrOverridesKnown = IsSpellKnownOrOverridesKnown
+
+local IsSpellInRange = C_Spell.IsSpellInRange
 local UnitPhaseReason = UnitPhaseReason
 
-local function getMaxRange(unit)
-	local minRange, maxRange = RangeCheck:GetRange(unit, true, true)
-	return (not minRange) or maxRange
+local list = {}
+UF.RangeSpells = list
+
+function UF:UpdateRangeList(db)
+	local spells = {}
+	for spell, value in next, db do
+		if value then
+			local id = tonumber(spell)
+			if not id then -- support spells by name
+				local _, _, _, _, _, _, spellID = E:GetSpellInfo(spell)
+				if spellID then
+					id = spellID
+				end
+			end
+
+			if id and IsSpellKnownOrOverridesKnown(id) then
+				spells[id] = true
+			end
+		end
+	end
+
+	return spells
 end
 
-local function friendlyIsInRange(realUnit)
+function UF:UpdateRangeSpells()
+	local db = E.global.unitframe.rangeCheck
+	if db then
+		list[1] = UF:UpdateRangeList(db.RESURRECT[E.myclass])
+		list[2] = UF:UpdateRangeList(db.ENEMY[E.myclass])
+		list[3] = UF:UpdateRangeList(db.FRIENDLY[E.myclass])
+	end
+end
+
+function UF:UnitSpellRange(unit, spells)
+	for spell in next, spells do
+		local range = IsSpellInRange(spell, unit)
+		if range ~= nil then
+			return range
+		end
+	end
+end
+
+function UF:UnitInSpellsRange(unit, which)
+	local spells = list[which]
+	local range = next(spells) and UF:UnitSpellRange(unit, spells)
+	if range ~= nil then
+		return range
+	end
+
+	return true -- no spells assume range is maxed
+end
+
+function UF:FriendlyInRange(realUnit)
 	local unit = E:GetGroupUnit(realUnit) or realUnit
 
-	if UnitIsPlayer(unit) and (E.Retail and UnitPhaseReason(unit) or not E.Retail and not UnitInPhase(unit)) then
-		return false -- is not in same phase
+	if UnitIsPlayer(unit) then
+		if E.Retail then
+			if UnitPhaseReason(unit) then
+				return false
+			end
+		elseif not UnitInPhase(unit) then
+			return false
+		end
 	end
 
-	local inRange, checkedRange = UnitInRange(unit)
-	if checkedRange and not inRange then
+	local range, checked = UnitInRange(unit)
+	if checked and not range then
 		return false -- blizz checked and said the unit is out of range
 	end
 
-	return getMaxRange(unit)
+	return UF:UnitInSpellsRange(unit, 3)
 end
 
 function UF:UpdateRange(unit)
-	if not self.Fader then return end
-	local alpha
+	local element = self.Fader
+	if not element then return end
 
-	unit = unit or self.unit
+	if not unit then
+		unit = self.unit
+	end
 
 	if self.forceInRange or unit == 'player' then
-		alpha = self.Fader.MaxAlpha
+		element.RangeAlpha = element.MaxAlpha
 	elseif self.forceNotInRange then
-		alpha = self.Fader.MinAlpha
+		element.RangeAlpha = element.MinAlpha
 	elseif unit then
-		if UnitCanAttack('player', unit) or UnitIsUnit(unit, 'pet') then
-			alpha = (getMaxRange(unit) and self.Fader.MaxAlpha) or self.Fader.MinAlpha
-		else
-			alpha = (UnitIsConnected(unit) and friendlyIsInRange(unit) and self.Fader.MaxAlpha) or self.Fader.MinAlpha
+		if UnitIsDeadOrGhost(unit) then
+			element.RangeAlpha = UF:UnitInSpellsRange(unit, 1) and element.MaxAlpha or element.MinAlpha
+		elseif UnitCanAttack('player', unit) then
+			element.RangeAlpha = UF:UnitInSpellsRange(unit, 2) and element.MaxAlpha or element.MinAlpha
+		elseif UnitIsConnected(unit) then
+			element.RangeAlpha = UF:FriendlyInRange(unit) and element.MaxAlpha or element.MinAlpha
 		end
 	else
-		alpha = self.Fader.MaxAlpha
+		element.RangeAlpha = element.MaxAlpha
 	end
-
-	self.Fader.RangeAlpha = alpha
 end

Diff for: ElvUI/Core/Modules/UnitFrames/UnitFrames.lua

@@ -1024,6 +1024,7 @@ end
 
 function UF:PLAYER_ENTERING_WORLD(_, initLogin, isReload)
 	UF:RegisterRaidDebuffIndicator()
+	UF:UpdateRangeSpells()
 
 	local _, instanceType = GetInstanceInfo()
 	if instanceType == 'raid' then

Diff for: ElvUI/Core/init.lua

@@ -157,7 +157,6 @@ do
 	E:AddLib('LAB', 'LibActionButton-1.0-ElvUI')
 	E:AddLib('LDB', 'LibDataBroker-1.1')
 	E:AddLib('SimpleSticky', 'LibSimpleSticky-1.0')
-	E:AddLib('RangeCheck', 'LibRangeCheck-3.0-ElvUI')
 	E:AddLib('CustomGlow', 'LibCustomGlow-1.0')
 	E:AddLib('Deflate', 'LibDeflate')
 	E:AddLib('Masque', 'Masque', true)

Diff for: ElvUI_Libraries/Cata/Libs.xml

@@ -25,7 +25,6 @@
 
 	<Script file='..\Classic\LibClassicSpecs\LibClassicSpecs.lua'/>
 
-	<Script file='..\Core\LibRangeCheck-3.0\LibRangeCheck-3.0.lua'/>
 	<Script file='..\Core\LibAceConfigHelper\LibAceConfigHelper.lua'/>
 	<Script file='..\Core\LibCustomGlow-1.0\LibCustomGlow-1.0.lua'/>
 	<Script file='..\Core\LibActionButton-1.0\LibActionButton-1.0.lua'/>

Diff for: ElvUI_Libraries/Classic/Libs.xml

@@ -27,7 +27,6 @@
 	<Script file='..\Classic\LibQuestXP\LibQuestXP.lua'/>
 	<Script file='..\Classic\LibClassicSpecs\LibClassicSpecs.lua'/>
 
-	<Script file='..\Core\LibRangeCheck-3.0\LibRangeCheck-3.0.lua'/>
 	<Script file='..\Core\LibAceConfigHelper\LibAceConfigHelper.lua'/>
 	<Script file='..\Core\LibCustomGlow-1.0\LibCustomGlow-1.0.lua'/>
 	<Script file='..\Core\LibActionButton-1.0\LibActionButton-1.0.lua'/>