From 1ded2379523ef541470124ec8e3eba463ae9a345 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Tue, 5 Mar 2013 19:45:41 +0000 Subject: [PATCH] Make BurningEmbers() and SoulShards() match in-game tooltips. This backs out r729 to make BurningEmbers() return between 0 and 40 and modifies SoulShards() so that it again returns between 0 and 4. This matches the way the resources are tracked in-game via tooltips in terms of spell cost. Fix the default warlock script to match above usage. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@731 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleData.lua | 2 +- OvaleState.lua | 2 +- defaut/Demoniste.lua | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OvaleData.lua b/OvaleData.lua index e25464b..f6f89ef 100644 --- a/OvaleData.lua +++ b/OvaleData.lua @@ -62,7 +62,7 @@ OvaleData.power = focus = { id = SPELL_POWER_FOCUS, mini = 0, maxi = 100 }, energy = { id = SPELL_POWER_ENERGY, mini = 0, maxi = 100 }, runicpower = { id = SPELL_POWER_RUNIC_POWER, mini = 0, maxi = 100 }, - shards = { id = SPELL_POWER_SOUL_SHARDS, mini = 0, segments = true }, + shards = { id = SPELL_POWER_SOUL_SHARDS, mini = 0 }, eclipse = { id = SPELL_POWER_ECLIPSE, mini = -100, maxi = 100 }, holy = { id = SPELL_POWER_HOLY_POWER, mini = 0, maxi = 5 }, alternate = { id = SPELL_POWER_ALTERNATE_POWER, mini = 0 }, diff --git a/OvaleState.lua b/OvaleState.lua index 723f119..5700dd6 100644 --- a/OvaleState.lua +++ b/OvaleState.lua @@ -96,7 +96,7 @@ function OvaleState:Reset() self.attenteFinCast = self.maintenant self.state.combo = OvaleComboPoints.combo for k,v in pairs(OvaleData.power) do - self.state[k] = UnitPower("player", v.id, v.segments) / (v.segments and 10 or 1) + self.state[k] = UnitPower("player", v.id, v.segments) end self:UpdatePowerRates() diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index 68cfe19..ebeda96 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -254,7 +254,7 @@ AddIcon mastery=3 help=main if {target.TicksRemain(immolate) =5 Spell(immolate) if Charges(conflagrate) ==2 Spell(conflagrate) if not target.DebuffPresent(rain_of_fire) and not InFlightToTarget(rain_of_fire) Spell(rain_of_fire) - if BurningEmbers() and {BuffStacks(backdraft) <3 or Level() <86 } and {BurningEmbers() >3.5 or BuffRemains(dark_soul) >CastTime(chaos_bolt) or BuffRemains(skull_banner) >CastTime(chaos_bolt) } Spell(chaos_bolt) + if BurningEmbers() and {BuffStacks(backdraft) <3 or Level() <86 } and {BurningEmbers() >35 or BuffRemains(dark_soul) >CastTime(chaos_bolt) or BuffRemains(skull_banner) >CastTime(chaos_bolt) } Spell(chaos_bolt) Spell(conflagrate) Spell(incinerate) } @@ -269,8 +269,8 @@ AddIcon mastery=3 help=aoe { if not target.DebuffPresent(rain_of_fire) and not InFlightToTarget(rain_of_fire) Spell(rain_of_fire) - if BurningEmbers() >=3.5 and BurningEmbers() and target.HealthPercent() <=20 focus.Spell(havoc) - if BurningEmbers() >=3.5 and BurningEmbers() and BuffStacks(havoc) >=1 if target.HealthPercent(less 20) Spell(shadowburn) + if BurningEmbers() >=35 and BurningEmbers() and target.HealthPercent() <=20 focus.Spell(havoc) + if BurningEmbers() >=35 and BurningEmbers() and BuffStacks(havoc) >=1 if target.HealthPercent(less 20) Spell(shadowburn) if BurningEmbers() and BuffExpires(fire_and_brimstone) Spell(fire_and_brimstone) if BuffPresent(fire_and_brimstone) and not target.DebuffPresent(immolate) Spell(immolate) if BuffPresent(fire_and_brimstone) Spell(conflagrate) -- 1.7.9.5