From 84ed8f5ce82fa0a6b36edf827c670e9a11e821ee Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Fri, 15 Nov 2013 19:57:29 +0000 Subject: [PATCH] Ensure OvaleEclipse loads after OvalePower. OvalePower maintains the eclipse energy level for the state machine that gets manipulated by OvaleEclipse. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1173 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.toc | 2 +- OvaleEclipse.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Ovale.toc b/Ovale.toc index 2a6331d..e211cf4 100644 --- a/Ovale.toc +++ b/Ovale.toc @@ -46,7 +46,6 @@ OvaleSwing.lua OvaleAura.lua OvaleComboPoints.lua OvaleCooldown.lua -OvaleEclipse.lua OvaleOptions.lua OvalePower.lua OvaleRecount.lua @@ -54,6 +53,7 @@ OvaleRunes.lua OvaleSkada.lua # OvaleCompile.lua +OvaleEclipse.lua OvaleFuture.lua OvaleIcone.lua OvaleIcone.xml diff --git a/OvaleEclipse.lua b/OvaleEclipse.lua index 4007113..758a44d 100644 --- a/OvaleEclipse.lua +++ b/OvaleEclipse.lua @@ -114,6 +114,8 @@ end --[[---------------------------------------------------------------------------- State machine for simulator. + + AFTER: OvalePower --]]---------------------------------------------------------------------------- -- @@ -125,12 +127,11 @@ OvaleEclipse.statePrototype = { -- -- Initialize the state. function OvaleEclipse:InitializeState(state) - state.eclipseDirection = nil + state.eclipseDirection = 0 end -- Reset the state to the current conditions. function OvaleEclipse:ResetState(state) - state.eclipse = self.eclipse or 0 state.eclipseDirection = self.eclipseDirection end -- 1.7.9.5