xiconfjs/Gladdy-TBC
1
0
Fork 0
Code Issues 36 Pull Requests 2 Packages Projects Releases 30 Wiki Activity

fix SpotEnemy

Browse Source
This commit is contained in:
Sumsebrum 2021-08-19 18:57:27 +02:00
parent fad4321bf6
commit 9e81455ec5
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
EventListener.lua
View File

@ -48,6 +48,9 @@ end
function Gladdy:SpotEnemy(unit, auraScan) function Gladdy:SpotEnemy(unit, auraScan)
local button = self.buttons[unit] local button = self.buttons[unit]
if not unit or not button then
return
end
button.raceLoc = UnitRace(unit) button.raceLoc = UnitRace(unit)
button.race = select(2, UnitRace(unit)) button.race = select(2, UnitRace(unit))
button.classLoc = select(1, UnitClass(unit)) button.classLoc = select(1, UnitClass(unit))
@ -55,7 +58,9 @@ function Gladdy:SpotEnemy(unit, auraScan)
button.name = UnitName(unit) button.name = UnitName(unit)
button.stealthed = false button.stealthed = false
Gladdy.guids[UnitGUID(unit)] = unit Gladdy.guids[UnitGUID(unit)] = unit
if button.class and button.race then
Gladdy:SendMessage("ENEMY_SPOTTED", unit) Gladdy:SendMessage("ENEMY_SPOTTED", unit)
end
if auraScan and not button.spec then if auraScan and not button.spec then
for n = 1, 30 do for n = 1, 30 do
local spellName,_,_,_,_,_,unitCaster = UnitAura(unit, n, "HELPFUL") local spellName,_,_,_,_,_,unitCaster = UnitAura(unit, n, "HELPFUL")
@ -88,7 +93,7 @@ function EventListener:COMBAT_LOG_EVENT_UNFILTERED()
Gladdy:SendMessage("UNIT_DEATH", destUnit) Gladdy:SendMessage("UNIT_DEATH", destUnit)
end end
-- spec detection -- spec detection
if not Gladdy.buttons[destUnit].class then if not Gladdy.buttons[destUnit].class or not Gladdy.buttons[destUnit].race then
Gladdy:SpotEnemy(destUnit, true) Gladdy:SpotEnemy(destUnit, true)
end end
--interrupt detection --interrupt detection
@ -119,7 +124,7 @@ function EventListener:COMBAT_LOG_EVENT_UNFILTERED()
end end
end end
if not Gladdy.buttons[srcUnit].class then if not Gladdy.buttons[srcUnit].class or not Gladdy.buttons[srcUnit].race then
Gladdy:SpotEnemy(srcUnit, true) Gladdy:SpotEnemy(srcUnit, true)
end end
if not Gladdy.buttons[srcUnit].spec then if not Gladdy.buttons[srcUnit].spec then
@ -138,7 +143,7 @@ function EventListener:ARENA_OPPONENT_UPDATE(unit, updateReason)
-- ENEMY_SPOTTED -- ENEMY_SPOTTED
if button then if button then
Gladdy:SendMessage("ENEMY_STEALTH", unit, false) Gladdy:SendMessage("ENEMY_STEALTH", unit, false)
if not button.class then if not button.class or not button.race then
Gladdy:SpotEnemy(unit, true) Gladdy:SpotEnemy(unit, true)
end end
end end
@ -189,7 +194,7 @@ function EventListener:UNIT_AURA(unit)
return return
end end
for i = 1, 2 do for i = 1, 2 do
if not Gladdy.buttons[unit].class then if not Gladdy.buttons[unit].class or not Gladdy.buttons[unit].race then
Gladdy:SpotEnemy(unit, false) Gladdy:SpotEnemy(unit, false)
end end
local filter = (i == 1 and "HELPFUL" or "HARMFUL") local filter = (i == 1 and "HELPFUL" or "HARMFUL")

2
Modules/Racial.lua
View File

@ -171,7 +171,7 @@ end
function Racial:ENEMY_SPOTTED(unit) function Racial:ENEMY_SPOTTED(unit)
local racial = self.frames[unit] local racial = self.frames[unit]
if (not racial) then if (not racial or not Gladdy.buttons[unit].race) then
return return
end end
racial.texture:SetTexture(Gladdy:Racials()[Gladdy.buttons[unit].race].texture) racial.texture:SetTexture(Gladdy:Racials()[Gladdy.buttons[unit].race].texture)