From e773ce8ebbb0cc2272d4ba25de691b11f834c52c Mon Sep 17 00:00:00 2001 From: Taracque Date: Wed, 19 Sep 2012 22:54:59 +0200 Subject: [PATCH] Added Ascendace/Lava Beam Version changed to 2.9.5 --- Change_log.txt | 3 +++ Elementarist.lua | 25 +++++++++++++++++++++++-- Elementarist.toc | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Change_log.txt b/Change_log.txt index 9a54c4d..78c6250 100755 --- a/Change_log.txt +++ b/Change_log.txt @@ -1,3 +1,6 @@ +**v2.9.5** +* Added: Ascendance + **v2.9.2** * Bugfix: Cooldown frame size fixed. * Bugfix: _ variable localized everywhere diff --git a/Elementarist.lua b/Elementarist.lua index 98ab096..a8f24f5 100755 --- a/Elementarist.lua +++ b/Elementarist.lua @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Elementarist 2.9.3 +-- Elementarist 2.9.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 = '2.9.3' +Elementarist.versionNumber = '2.9.5' Elementarist.playerName = UnitName("player") Elementarist.playerGUID = UnitGUID("player") Elementarist.targetGUID = nil @@ -67,6 +67,7 @@ Elementarist.SpellList = { ["Unleash Elements"] = GetSpellInfo(73680), ["Earthquake"] = GetSpellInfo(61882), ["Elemental Blast"] = GetSpellInfo(117014), + ["Ascendance"] = GetSpellInfo(114049), -- racials ["Berserking"] = GetSpellInfo(26297), -- Troll racial @@ -975,6 +976,14 @@ function Elementarist:MiscSpellElem() end end + -- Ascendance + if Elementarist:SpellAvailable(Elementarist.SpellList["Ascendance"]) then + d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Ascendance"]) + if d <= 0.5 then + return Elementarist.SpellList["Ascendance"] + end + end + -- Berserking if Elementarist:SpellAvailable(Elementarist.SpellList["Berserking"]) then d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Berserking"]) @@ -1066,6 +1075,18 @@ function Elementarist:IntSpellElem() end end + -- Lava Beam if there are multiple targets, (count in a dirty way from combat log, not to accurate!!!) + if Elementarist:SpellAvailable(Elementarist.SpellList["Lava Beam"]) then + if (Elementarist.person["foeCount"]>2) then + if IsSpellInRange(Elementarist.SpellList["Lava Beam"], "target") == 1 then + d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Lava Beam"]) + if (d<0.5) then + return Elementarist.SpellList["Lava Beam"] + end + end + end + end + -- CL if there are multiple targets, (count in a dirty way from combat log, not to accurate!!!) if (exspell1 ~= Elementarist.SpellList["Chain Lightning"]) and (exspell2 ~= Elementarist.SpellList["Chain Lightning"]) then if (Elementarist.person["foeCount"]>2) then diff --git a/Elementarist.toc b/Elementarist.toc index f6a97ac..6167b6d 100755 --- a/Elementarist.toc +++ b/Elementarist.toc @@ -2,7 +2,7 @@ ## Title: Elementarist ## Notes: Elemental shaman spell rotation helper ## Author: Taracque, Felmosórongy of Arathor -## Version: 2.9.3 +## Version: 2.9.5 ## SavedVariables: ElementaristDB ## OptionalDeps: OmniCC, SpellFlash ## Dependencies: -- 1.7.9.5