From 6e6c4f4e9128ad47f65c20338e8ce5ca0868a9ea Mon Sep 17 00:00:00 2001 From: Vae Date: Fri, 31 Jan 2025 14:38:26 -1000 Subject: [PATCH] Fix for Overheat Rune --- ConROC_Mage.toc | 4 ++-- mage.lua | 11 +++++++++++ mage_ids.lua | 32 +++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/ConROC_Mage.toc b/ConROC_Mage.toc index 7bed882..55b317c 100644 --- a/ConROC_Mage.toc +++ b/ConROC_Mage.toc @@ -1,7 +1,7 @@ ## Title:-|cffFFFFFFConROC|r- |cff69CCF0Mage|r -## Version: 1.15.15 +## Version: 1.15.16 ## Author: Vae -## Interface: 11505 +## Interface: 11506 ## SavedVariablesPerCharacter: ConROCMageSpells ## Dependencies: ConROC ## LoadOnDemand: 1 diff --git a/mage.lua b/mage.lua index 721b1ca..295435b 100644 --- a/mage.lua +++ b/mage.lua @@ -182,6 +182,17 @@ function ConROC.Mage.Damage(_, timeShift, currentSpell, gcd) --Rotations repeat while(true) do + if _FireBlast_RDY then + tinsert(ConROC.SuggestedSpells, _FireBlast); + _FireBlast_RDY = false; + _Queue = _Queue + 1; + break; + end + + + + + if ConROC:CheckBox(ConROC_SM_CD_Evocation) and ((_Evocation_RDY and _Mana_Percent < 10) or currentSpell == _Evocation) then tinsert(ConROC.SuggestedSpells, _Evocation); _Evocation_RDY = false; diff --git a/mage_ids.lua b/mage_ids.lua index 27a692d..c5e7719 100644 --- a/mage_ids.lua +++ b/mage_ids.lua @@ -129,6 +129,13 @@ ids.Rank = { FireBlastRank5 = 8413, FireBlastRank6 = 10197, FireBlastRank7 = 10199, + FireBlastSoDRank1 = 400618, + FireBlastSoDRank2 = 400619, + FireBlastSoDRank3 = 400616, + FireBlastSoDRank4 = 400620, + FireBlastSoDRank5 = 400621, + FireBlastSoDRank6 = 400622, + FireBlastSoDRank7 = 400623, FireWardRank1 = 543, FireWardRank2 = 8457, FireWardRank3 = 8458, @@ -266,7 +273,8 @@ ids.Frost_Talent = { ElementalPrecision = 17, } ids.Engrave = { - + --Cloak-- + Overheat = 6734, } ids.Runes = { ArcaneSurge = 425124, @@ -333,12 +341,22 @@ function ConROC:UpdateSpellID() elseif IsSpellKnown(ids.Rank.BlastWaveRank3) then ids.Ability.BlastWave = ids.Rank.BlastWaveRank3; elseif IsSpellKnown(ids.Rank.BlastWaveRank2) then ids.Ability.BlastWave = ids.Rank.BlastWaveRank2; end - if IsSpellKnown(ids.Rank.FireBlastRank7) then ids.Ability.FireBlast = ids.Rank.FireBlastRank7; - elseif IsSpellKnown(ids.Rank.FireBlastRank6) then ids.Ability.FireBlast = ids.Rank.FireBlastRank6; - elseif IsSpellKnown(ids.Rank.FireBlastRank5) then ids.Ability.FireBlast = ids.Rank.FireBlastRank5; - elseif IsSpellKnown(ids.Rank.FireBlastRank4) then ids.Ability.FireBlast = ids.Rank.FireBlastRank4; - elseif IsSpellKnown(ids.Rank.FireBlastRank3) then ids.Ability.FireBlast = ids.Rank.FireBlastRank3; - elseif IsSpellKnown(ids.Rank.FireBlastRank2) then ids.Ability.FireBlast = ids.Rank.FireBlastRank2; end + if ConROC.Seasons.IsSoD and ConROC:RuneEquipped(ids.Engrave.Overheat, "back") then + if IsSpellKnown(ids.Rank.FireBlastRank7) then ids.Ability.FireBlast = ids.Rank.FireBlastSoDRank7; + elseif IsSpellKnown(ids.Rank.FireBlastRank6) then ids.Ability.FireBlast = ids.Rank.FireBlastSoDRank6; + elseif IsSpellKnown(ids.Rank.FireBlastRank5) then ids.Ability.FireBlast = ids.Rank.FireBlastSoDRank5; + elseif IsSpellKnown(ids.Rank.FireBlastRank4) then ids.Ability.FireBlast = ids.Rank.FireBlastSoDRank4; + elseif IsSpellKnown(ids.Rank.FireBlastRank3) then ids.Ability.FireBlast = ids.Rank.FireBlastSoDRank3; + elseif IsSpellKnown(ids.Rank.FireBlastRank2) then ids.Ability.FireBlast = ids.Rank.FireBlastSoDRank2; + elseif IsSpellKnown(ids.Rank.FireBlastRank1) then ids.Ability.FireBlast = ids.Rank.FireBlastSoDRank1; end + else + if IsSpellKnown(ids.Rank.FireBlastRank7) then ids.Ability.FireBlast = ids.Rank.FireBlastRank7; + elseif IsSpellKnown(ids.Rank.FireBlastRank6) then ids.Ability.FireBlast = ids.Rank.FireBlastRank6; + elseif IsSpellKnown(ids.Rank.FireBlastRank5) then ids.Ability.FireBlast = ids.Rank.FireBlastRank5; + elseif IsSpellKnown(ids.Rank.FireBlastRank4) then ids.Ability.FireBlast = ids.Rank.FireBlastRank4; + elseif IsSpellKnown(ids.Rank.FireBlastRank3) then ids.Ability.FireBlast = ids.Rank.FireBlastRank3; + elseif IsSpellKnown(ids.Rank.FireBlastRank2) then ids.Ability.FireBlast = ids.Rank.FireBlastRank2; end + end if IsSpellKnown(ids.Rank.FireWardRank5) then ids.Ability.FireWard = ids.Rank.FireWardRank5; elseif IsSpellKnown(ids.Rank.FireWardRank4) then ids.Ability.FireWard = ids.Rank.FireWardRank4;