From a570856092d9b0f39a908e4d3a4963f2cbe6ed86 Mon Sep 17 00:00:00 2001 From: Taracque Date: Sun, 17 May 2015 12:13:37 +0200 Subject: [PATCH] ***v3.4.5 * Fixed: Minor rotation tweaks * Fixed: Better Flame Shock tracking on non targeted units --- Change_log.txt | 4 ++++ Elementarist.lua | 21 ++++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Change_log.txt b/Change_log.txt index fc43911..1bac282 100755 --- a/Change_log.txt +++ b/Change_log.txt @@ -1,3 +1,7 @@ +***v3.4.5 +* Fixed: Minor rotation tweaks +* Fixed: Better Flame Shock tracking on non targeted units + ***v3.4.4 * Fixed: Better Flame Shock tracking on non targeted units diff --git a/Elementarist.lua b/Elementarist.lua index c047494..823073a 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Elementarist 3.4.4 +-- Elementarist 3.4.5 -- -- Shows the advised spell for an elemental shaman for optimal DPS output. ------------------------------------------------------------------------------- @@ -8,7 +8,7 @@ Elementarist = {Locals = {}} local L = Elementarist.Locals -Elementarist.versionNumber = '3.4.4'; +Elementarist.versionNumber = '3.4.5'; Elementarist.enabled = true; Elementarist.playerName = UnitName("player") Elementarist.playerGUID = UnitGUID("player") @@ -470,35 +470,26 @@ end function Elementarist:CountPerson(time, event, sguid, sname, sflags, dguid, dname, dflags) local suffix = event:match(".+(_.-)$") if Elementarist.HostileFilter[suffix] then - local stype = false; - local dtype = false; - - if (sguid) and (sguid:sub(1,6)) and ((sguid:sub(1,6) == 'Player') or (sguid:sub(1,6) == 'Creatu')) then - stype = true; - end - if (dguid) and (dguid:sub(1,6)) and ((dguid:sub(1,6) == 'Player') or (dguid:sub(1,6) == 'Creatu')) then - dtype = true; - end - if (bit.band(dflags, COMBATLOG_OBJECT_REACTION_HOSTILE) == COMBATLOG_OBJECT_REACTION_HOSTILE) and (bit.band(dflags, COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) == COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) and (dtype) then + if (bit.band(dflags, COMBATLOG_OBJECT_REACTION_HOSTILE) == COMBATLOG_OBJECT_REACTION_HOSTILE) and (bit.band(dflags, COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) == COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) then if (not Elementarist.person["foe"][dguid]) then Elementarist.person["foeCount"] = Elementarist.person["foeCount"] + 1 Elementarist:Debug('Enemy added', Elementarist.person["foeCount"] .. " " .. dguid .. " " .. dflags) end Elementarist.person["foe"][dguid] = GetTime() - elseif (bit.band(sflags, COMBATLOG_OBJECT_REACTION_HOSTILE) == COMBATLOG_OBJECT_REACTION_HOSTILE) and (bit.band(sflags, COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) == COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) and (stype) then + elseif (bit.band(sflags, COMBATLOG_OBJECT_REACTION_HOSTILE) == COMBATLOG_OBJECT_REACTION_HOSTILE) and (bit.band(sflags, COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) == COMBATLOG_OBJECT_AFFILIATION_OUTSIDER) then if ((not Elementarist.person["foe"][sguid]) or (Elementarist.person["foe"][sguid]==0)) then Elementarist.person["foeCount"] = Elementarist.person["foeCount"] + 1 Elementarist:Debug('Enemy added', Elementarist.person["foeCount"] .. " " .. sguid .. " flags: " .. dflags) end Elementarist.person["foe"][sguid] = GetTime() end - if (bit.band(dflags, COMBATLOG_OBJECT_REACTION_FRIENDLY) == COMBATLOG_OBJECT_REACTION_FRIENDLY) and (dtype) then + if (bit.band(dflags, COMBATLOG_OBJECT_REACTION_FRIENDLY) == COMBATLOG_OBJECT_REACTION_FRIENDLY) then if ((not Elementarist.person["friend"][dguid]) or (Elementarist.person["friend"][dguid]==0)) then Elementarist.person["friendCount"] = Elementarist.person["friendCount"] + 1 Elementarist:Debug('Friend added', Elementarist.person["friendCount"] .. " " .. dguid .. " flags: " .. dflags) end Elementarist.person["friend"][dguid] = GetTime() - elseif (bit.band(sflags, COMBATLOG_OBJECT_REACTION_FRIENDLY) == COMBATLOG_OBJECT_REACTION_FRIENDLY) and (stype) then + elseif (bit.band(sflags, COMBATLOG_OBJECT_REACTION_FRIENDLY) == COMBATLOG_OBJECT_REACTION_FRIENDLY) then if ((not Elementarist.person["friend"][sguid]) or (Elementarist.person["friend"][sguid]==0)) then Elementarist.person["friendCount"] = Elementarist.person["friendCount"] + 1 Elementarist:Debug('Friend added', Elementarist.person["friendCount"] .. " " .. sguid .. " " .. sflags) -- 1.7.9.5