From 6c1e90f19cd3912cb23f275f95783ed81c41969c Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sat, 16 Mar 2013 08:03:55 +0000 Subject: [PATCH] Remove all addon variables from the global namespace. The only addon variable left in the global namespace is ``Ovale'', which represents the main addon object. This change also makes explicit the dependencies between modules. Reorder Lua files in the TOC file to ensure module dependencies are met. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@779 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.lua | 3 +++ Ovale.toc | 10 ++++++---- OvaleActionBar.lua | 2 +- OvaleAura.lua | 5 ++++- OvaleBestAction.lua | 10 +++++++++- OvaleComboPoints.lua | 6 +++++- OvaleCompile.lua | 9 ++++++++- OvaleCondition.lua | 13 ++++++++++++- OvaleData.lua | 6 +++++- OvaleEnemies.lua | 2 +- OvaleEquipement.lua | 2 +- OvaleFrame.lua | 7 ++++++- OvaleFuture.lua | 8 +++++++- OvaleGUID.lua | 2 +- OvaleIcone.lua | 4 ++++ OvaleOptions.lua | 8 +++++++- OvalePaperDoll.lua | 2 +- OvaleRecount.lua | 2 +- OvaleScripts.lua | 3 ++- OvaleSkada.lua | 2 +- OvaleSpellDamage.lua | 4 +++- OvaleStance.lua | 2 +- OvaleState.lua | 12 +++++++++++- OvaleSwing.lua | 6 ++++-- defaut/Chaman.lua | 3 +++ defaut/Chasseur.lua | 3 +++ defaut/Chevalier.lua | 3 +++ defaut/Demoniste.lua | 3 +++ defaut/Druide.lua | 3 +++ defaut/Guerrier.lua | 3 +++ defaut/Mage.lua | 3 +++ defaut/Moine.lua | 3 +++ defaut/Paladin.lua | 3 +++ defaut/Pretre.lua | 3 +++ defaut/Voleur.lua | 3 +++ 35 files changed, 137 insertions(+), 26 deletions(-) diff --git a/Ovale.lua b/Ovale.lua index 4937234..59b7ff5 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -12,6 +12,7 @@ _G.Ovale = LibStub("AceAddon-3.0"):NewAddon(Ovale, "Ovale", "AceConsole-3.0", "A -- local L = LibStub("AceLocale-3.0"):GetLocale("Ovale") +local OvaleOptions = nil local ipairs, pairs, strsplit, tinsert, tsort = ipairs, pairs, string.split, table.insert, table.sort local SendAddonMessage, UnitAura, UnitCanAttack = SendAddonMessage, UnitAura, UnitCanAttack @@ -90,7 +91,9 @@ function Ovale:OnEnable() self:RegisterEvent("PLAYER_TARGET_CHANGED") self:RegisterEvent("CHAT_MSG_ADDON") + OvaleOptions = Ovale:GetModule("OvaleOptions") local profile = OvaleOptions:GetProfile() + self.frame = LibStub("AceGUI-3.0"):Create("OvaleFrame") self.frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", profile.left, profile.top) self:UpdateFrame() diff --git a/Ovale.toc b/Ovale.toc index 858c827..382dc81 100644 --- a/Ovale.toc +++ b/Ovale.toc @@ -35,9 +35,7 @@ OvalePaperDoll.lua OvalePool.lua OvaleRecount.lua OvaleSkada.lua -OvaleSpellDamage.lua OvaleStance.lua -OvaleSwing.lua # First tier of modules with dependencies OvaleData.lua @@ -53,6 +51,8 @@ defaut\Pretre.lua defaut\Voleur.lua defaut\Moine.lua defaut\Chevalier.lua +OvaleSpellDamage.lua +OvaleSwing.lua # Second tier of modules with dependencies OvaleAura.lua @@ -62,11 +62,13 @@ OvaleState.lua # Third tier of modules with dependencies OvaleCondition.lua -OvaleBestAction.lua OvaleOptions.lua # Fourth tier of modules with dependencies +OvaleBestAction.lua +OvaleCompile.lua OvaleIcone.lua OvaleIcone.xml -OvaleCompile.lua + +# Fifth tier of modules with dependencies OvaleFrame.lua diff --git a/OvaleActionBar.lua b/OvaleActionBar.lua index b52a77a..3c27830 100644 --- a/OvaleActionBar.lua +++ b/OvaleActionBar.lua @@ -9,7 +9,7 @@ -- Keep data about the player action bars (key bindings mostly) local _, Ovale = ... -OvaleActionBar = Ovale:NewModule("OvaleActionBar", "AceEvent-3.0") +local OvaleActionBar = Ovale:NewModule("OvaleActionBar", "AceEvent-3.0") -- local tonumber = tonumber diff --git a/OvaleAura.lua b/OvaleAura.lua index e4db07f..b8578a5 100644 --- a/OvaleAura.lua +++ b/OvaleAura.lua @@ -11,7 +11,7 @@ -- Fore each aura, it saves the state of the player when it was refreshed local _, Ovale = ... -OvaleAura = Ovale:NewModule("OvaleAura", "AceEvent-3.0") +local OvaleAura = Ovale:NewModule("OvaleAura", "AceEvent-3.0") -- OvaleAura.aura = {} @@ -19,6 +19,9 @@ OvaleAura.serial = 0 -- -- +local OvaleData = Ovale:GetModule("OvaleData") +local OvaleGUID = Ovale:GetModule("OvaleGUID") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") local OvalePool = Ovale.poolPrototype local baseDamageMultiplier = 1 diff --git a/OvaleBestAction.lua b/OvaleBestAction.lua index d39e320..455661a 100644 --- a/OvaleBestAction.lua +++ b/OvaleBestAction.lua @@ -8,9 +8,17 @@ ----------------------------------------------------------------------]] local _, Ovale = ... -OvaleBestAction = {} +local OvaleBestAction = {} +Ovale.bestActionModule = OvaleBestAction -- +local OvaleActionBar = Ovale:GetModule("OvaleActionBar") +local OvaleCondition = Ovale.conditionModule +local OvaleData = Ovale:GetModule("OvaleData") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleStance = Ovale:GetModule("OvaleStance") +local OvaleState = Ovale.stateModule + local floor, ipairs, loadstring, pairs = math.floor, ipairs, loadstring, pairs local strfind, tonumber, tostring = string.find, tonumber, tostring local GetActionCooldown, GetActionTexture, GetInventorySlotInfo = GetActionCooldown, GetActionTexture, GetInventorySlotInfo diff --git a/OvaleComboPoints.lua b/OvaleComboPoints.lua index 3fd6866..1434f7f 100644 --- a/OvaleComboPoints.lua +++ b/OvaleComboPoints.lua @@ -10,9 +10,13 @@ -- This addon tracks the number of combo points by the player on the current target. local _, Ovale = ... -OvaleComboPoints = Ovale:NewModule("OvaleComboPoints", "AceEvent-3.0") +local OvaleComboPoints = Ovale:NewModule("OvaleComboPoints", "AceEvent-3.0") -- +local OvaleData = Ovale:GetModule("OvaleData") +local OvaleGUID = Ovale:GetModule("OvaleGUID") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") + local GetComboPoints = GetComboPoints local UnitGUID = UnitGUID local MAX_COMBO_POINTS = MAX_COMBO_POINTS diff --git a/OvaleCompile.lua b/OvaleCompile.lua index 198eb0f..630531e 100644 --- a/OvaleCompile.lua +++ b/OvaleCompile.lua @@ -8,11 +8,18 @@ ----------------------------------------------------------------------]] local _, Ovale = ... -OvaleCompile = Ovale:NewModule("OvaleCompile", "AceEvent-3.0") +local OvaleCompile = Ovale:NewModule("OvaleCompile", "AceEvent-3.0") -- local L = Ovale.L +local OvaleCondition = Ovale.conditionModule +local OvaleData = Ovale:GetModule("OvaleData") +local OvaleEquipement = Ovale:GetModule("OvaleEquipement") +local OvaleOptions = Ovale:GetModule("OvaleOptions") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") local OvalePool = Ovale.poolPrototype +local OvaleScripts = Ovale:GetModule("OvaleScripts") +local OvaleStance = Ovale:GetModule("OvaleStance") local node = {} local nodePool = OvalePool:NewPool("OvaleCompile_nodePool") diff --git a/OvaleCondition.lua b/OvaleCondition.lua index 4da8163..8eabbe8 100644 --- a/OvaleCondition.lua +++ b/OvaleCondition.lua @@ -8,11 +8,22 @@ ----------------------------------------------------------------------]] local _, Ovale = ... -OvaleCondition = {} +local OvaleCondition = {} +Ovale.conditionModule = OvaleCondition -- local LBCT = LibStub("LibBabble-CreatureType-3.0"):GetLookupTable() local LRC = LibStub("LibRangeCheck-2.0", true) +local OvaleAura = Ovale:GetModule("OvaleAura") +local OvaleData = Ovale:GetModule("OvaleData") +local OvaleEnemies = Ovale:GetModule("OvaleEnemies") +local OvaleEquipement = Ovale:GetModule("OvaleEquipement") +local OvaleFuture = Ovale:GetModule("OvaleFuture") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleSpellDamage = Ovale:GetModule("OvaleSpellDamage") +local OvaleStance = Ovale:GetModule("OvaleStance") +local OvaleState = Ovale.stateModule +local OvaleSwing = Ovale:GetModule("OvaleSwing") local runes = {} local runesCD = {} diff --git a/OvaleData.lua b/OvaleData.lua index 525e74f..108e75b 100644 --- a/OvaleData.lua +++ b/OvaleData.lua @@ -8,9 +8,13 @@ ----------------------------------------------------------------------]] local _, Ovale = ... -OvaleData = Ovale:NewModule("OvaleData", "AceEvent-3.0") +local OvaleData = Ovale:NewModule("OvaleData", "AceEvent-3.0") -- +local OvaleData = Ovale:GetModule("OvaleData") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleStance = Ovale:GetModule("OvaleStance") + local ipairs, pairs, tinsert, tonumber, tostring, tsort = ipairs, pairs, table.insert, tonumber, tostring, table.sort local GetNumGlyphSockets = GetNumGlyphSockets local GetGlyphSocketInfo = GetGlyphSocketInfo diff --git a/OvaleEnemies.lua b/OvaleEnemies.lua index 4874079..1d4f5c1 100644 --- a/OvaleEnemies.lua +++ b/OvaleEnemies.lua @@ -10,7 +10,7 @@ -- Gather information about ennemies local _, Ovale = ... -OvaleEnemies = Ovale:NewModule("OvaleEnemies", "AceEvent-3.0") +local OvaleEnemies = Ovale:NewModule("OvaleEnemies", "AceEvent-3.0") -- local bit_band, pairs, select, tostring = bit.band, pairs, select, tostring diff --git a/OvaleEquipement.lua b/OvaleEquipement.lua index 8670998..5280884 100644 --- a/OvaleEquipement.lua +++ b/OvaleEquipement.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------]] local _, Ovale = ... -OvaleEquipement = Ovale:NewModule("OvaleEquipement", "AceEvent-3.0") +local OvaleEquipement = Ovale:NewModule("OvaleEquipement", "AceEvent-3.0") -- local pairs = pairs diff --git a/OvaleFrame.lua b/OvaleFrame.lua index 8562882..b22ed2c 100644 --- a/OvaleFrame.lua +++ b/OvaleFrame.lua @@ -14,7 +14,12 @@ do -- local AceGUI = LibStub("AceGUI-3.0") local Masque = LibStub("Masque", true) - local Ovale = LibStub("AceAddon-3.0"):GetAddon("Ovale") + local OvaleBestAction = Ovale.bestActionModule + local OvaleCompile = Ovale:GetModule("OvaleCompile") + local OvaleCondition = Ovale.conditionModule + local OvaleData = Ovale:GetModule("OvaleData") + local OvaleOptions = Ovale:GetModule("OvaleOptions") + local OvaleState = Ovale.stateModule local Type = "OvaleFrame" local Version = 7 diff --git a/OvaleFuture.lua b/OvaleFuture.lua index 9647b6d..69c141b 100644 --- a/OvaleFuture.lua +++ b/OvaleFuture.lua @@ -10,9 +10,15 @@ -- The travelling missiles or spells that have been cast but whose effects were not still not applied local _, Ovale = ... -OvaleFuture = Ovale:NewModule("OvaleFuture", "AceEvent-3.0") +local OvaleFuture = Ovale:NewModule("OvaleFuture", "AceEvent-3.0") -- +local OvaleAura = Ovale:GetModule("OvaleAura") +local OvaleComboPoints = Ovale:GetModule("OvaleComboPoints") +local OvaleData = Ovale:GetModule("OvaleData") +local OvaleGUID = Ovale:GetModule("OvaleGUID") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") + local ipairs = ipairs local pairs = pairs local select = select diff --git a/OvaleGUID.lua b/OvaleGUID.lua index 0a96e82..9f654ae 100644 --- a/OvaleGUID.lua +++ b/OvaleGUID.lua @@ -11,7 +11,7 @@ -- Usage: OvaleGUID:GetUnitId(guid) local _, Ovale = ... -OvaleGUID = Ovale:NewModule("OvaleGUID", "AceEvent-3.0", "AceConsole-3.0") +local OvaleGUID = Ovale:NewModule("OvaleGUID", "AceEvent-3.0", "AceConsole-3.0") -- local strfind, strsub = string.find, string.sub diff --git a/OvaleIcone.lua b/OvaleIcone.lua index 5458dfa..2fba58d 100644 --- a/OvaleIcone.lua +++ b/OvaleIcone.lua @@ -13,6 +13,10 @@ local _, Ovale = ... -- local L = Ovale.L +local OvaleData = Ovale:GetModule("OvaleData") +local OvaleOptions = Ovale:GetModule("OvaleOptions") +local OvaleState = Ovale.stateModule + local strfind, strformat, strsub = string.find, string.format, string.sub -- diff --git a/OvaleOptions.lua b/OvaleOptions.lua index a758763..e02ce9b 100644 --- a/OvaleOptions.lua +++ b/OvaleOptions.lua @@ -10,9 +10,15 @@ -- Ovale options and UI local _, Ovale = ... -OvaleOptions = Ovale:NewModule("OvaleOptions", "AceConsole-3.0", "AceEvent-3.0") +local OvaleOptions = Ovale:NewModule("OvaleOptions", "AceConsole-3.0", "AceEvent-3.0") -- +local OvaleData = Ovale:GetModule("OvaleData") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleScripts = Ovale:GetModule("OvaleScripts") +local OvaleStance = Ovale:GetModule("OvaleStance") +local OvaleState = Ovale.stateModule + local strgmatch, strgsub, tostring = string.gmatch, string.gsub, tostring -- diff --git a/OvalePaperDoll.lua b/OvalePaperDoll.lua index 213a03e..1eb1777 100644 --- a/OvalePaperDoll.lua +++ b/OvalePaperDoll.lua @@ -10,7 +10,7 @@ -- This addon tracks the player's stats as available on the in-game paper doll. local _, Ovale = ... -OvalePaperDoll = Ovale:NewModule("OvalePaperDoll", "AceEvent-3.0") +local OvalePaperDoll = Ovale:NewModule("OvalePaperDoll", "AceEvent-3.0") -- local select = select diff --git a/OvaleRecount.lua b/OvaleRecount.lua index f26c133..4d723fb 100644 --- a/OvaleRecount.lua +++ b/OvaleRecount.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------]] local _, Ovale = ... -OvaleRecount = Ovale:NewModule("OvaleRecount") +local OvaleRecount = Ovale:NewModule("OvaleRecount") -- local Recount = LibStub("AceAddon-3.0"):GetAddon("Recount", true) diff --git a/OvaleScripts.lua b/OvaleScripts.lua index b13eb1c..863bb53 100644 --- a/OvaleScripts.lua +++ b/OvaleScripts.lua @@ -10,9 +10,10 @@ -- This addon is a script repository. local _, Ovale = ... -OvaleScripts = Ovale:NewModule("OvaleScripts") +local OvaleScripts = Ovale:NewModule("OvaleScripts") -- +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") -- -- diff --git a/OvaleSkada.lua b/OvaleSkada.lua index 9a309f0..bbdfbd1 100644 --- a/OvaleSkada.lua +++ b/OvaleSkada.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------]] local _, Ovale = ... -OvaleSkada = Ovale:NewModule("OvaleSkada") +local OvaleSkada = Ovale:NewModule("OvaleSkada") -- local Skada = LibStub("AceAddon-3.0"):GetAddon("Skada", true) diff --git a/OvaleSpellDamage.lua b/OvaleSpellDamage.lua index 1d1edf2..911eb22 100644 --- a/OvaleSpellDamage.lua +++ b/OvaleSpellDamage.lua @@ -10,9 +10,11 @@ -- Add-on that registers how many damage made the last spell cast by the player local _, Ovale = ... -OvaleSpellDamage = Ovale:NewModule("OvaleSpellDamage", "AceEvent-3.0") +local OvaleSpellDamage = Ovale:NewModule("OvaleSpellDamage", "AceEvent-3.0") -- +local OvaleGUID = Ovale:GetModule("OvaleGUID") + local select = select local strfind = string.find diff --git a/OvaleStance.lua b/OvaleStance.lua index 8058bb9..2f29c68 100644 --- a/OvaleStance.lua +++ b/OvaleStance.lua @@ -10,7 +10,7 @@ -- This addon tracks the player's current stance. local _, Ovale = ... -OvaleStance = Ovale:NewModule("OvaleStance", "AceEvent-3.0") +local OvaleStance = Ovale:NewModule("OvaleStance", "AceEvent-3.0") -- local ipairs = ipairs diff --git a/OvaleState.lua b/OvaleState.lua index 690a217..9b1bc1b 100644 --- a/OvaleState.lua +++ b/OvaleState.lua @@ -9,8 +9,9 @@ -- Keep the current state in the simulation -local Ovale = LibStub("AceAddon-3.0"):GetAddon("Ovale") +local _, Ovale = ... OvaleState = {} +Ovale.stateModule = OvaleState -- --the state in the current frame @@ -35,6 +36,15 @@ OvaleState.lastSpellId = nil -- -- +local OvaleAura = Ovale:GetModule("OvaleAura") +local OvaleComboPoints = Ovale:GetModule("OvaleComboPoints") +local OvaleData = Ovale:GetModule("OvaleData") +local OvaleEquipement = Ovale:GetModule("OvaleEquipement") +local OvaleFuture = Ovale:GetModule("OvaleFuture") +local OvaleGUID = Ovale:GetModule("OvaleGUID") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") +local OvaleStance = Ovale:GetModule("OvaleStance") + local floor, pairs, tostring = math.floor, pairs, tostring local GetRuneCooldown, GetRuneType = GetRuneCooldown, GetRuneType local GetSpellInfo, UnitGUID, UnitHealth = GetSpellInfo, UnitGUID, UnitHealth diff --git a/OvaleSwing.lua b/OvaleSwing.lua index 30663ca..8547d80 100644 --- a/OvaleSwing.lua +++ b/OvaleSwing.lua @@ -19,7 +19,7 @@ ]] local _, Ovale = ... -OvaleSwing = Ovale:NewModule("OvaleSwing", "AceEvent-3.0") +local OvaleSwing = Ovale:NewModule("OvaleSwing", "AceEvent-3.0") -- OvaleSwing.ohNext = nil @@ -31,10 +31,12 @@ OvaleSwing.ohDuration = nil OvaleSwing.delay = nil OvaleSwing.startdelay = nil OvaleSwing.swingmode = nil - -- -- +local OvaleGUID = Ovale:GetModule("OvaleGUID") +local OvalePaperDoll = Ovale:GetModule("OvalePaperDoll") + local unpack = unpack local math_abs = math.abs local GetSpellInfo, GetTime, UnitAttackSpeed = GetSpellInfo, GetTime, UnitAttackSpeed diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua index 397b396..971b718 100644 --- a/defaut/Chaman.lua +++ b/defaut/Chaman.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(ancestral_swiftness 16188) SpellInfo(ancestral_swiftness cd=90 ) diff --git a/defaut/Chasseur.lua b/defaut/Chasseur.lua index 50e8a23..63437f6 100644 --- a/defaut/Chasseur.lua +++ b/defaut/Chasseur.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(a_murder_of_crows 131900) Define(aimed_shot 19434) diff --git a/defaut/Chevalier.lua b/defaut/Chevalier.lua index ce6ac36..e7e0e9e 100644 --- a/defaut/Chevalier.lua +++ b/defaut/Chevalier.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(army_of_the_dead 42650) SpellInfo(army_of_the_dead duration=4 frost=1 blood=1 unholy=1 runicpower=-300 cd=600 ) diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index 23e5464..a90220a 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(agony 980) SpellInfo(agony duration=24 tick=2 ) diff --git a/defaut/Druide.lua b/defaut/Druide.lua index b565849..6798f3b 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(berserk 50334) SpellInfo(berserk duration=10 cd=180 ) diff --git a/defaut/Guerrier.lua b/defaut/Guerrier.lua index 4fe6d1c..b863903 100644 --- a/defaut/Guerrier.lua +++ b/defaut/Guerrier.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(avatar 107574) SpellInfo(avatar duration=24 cd=180 ) diff --git a/defaut/Mage.lua b/defaut/Mage.lua index 8566d52..5b7681c 100644 --- a/defaut/Mage.lua +++ b/defaut/Mage.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(alter_time 110909) SpellInfo(alter_time duration=6 ) diff --git a/defaut/Moine.lua b/defaut/Moine.lua index ef9eb88..e34bb0e 100644 --- a/defaut/Moine.lua +++ b/defaut/Moine.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(berserking 26297) SpellInfo(berserking duration=10 cd=180 ) diff --git a/defaut/Paladin.lua b/defaut/Paladin.lua index 2a32576..c2e9b94 100644 --- a/defaut/Paladin.lua +++ b/defaut/Paladin.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(avenging_wrath 31884) SpellInfo(avenging_wrath duration=20 cd=180 ) diff --git a/defaut/Pretre.lua b/defaut/Pretre.lua index 297c788..311e1e6 100644 --- a/defaut/Pretre.lua +++ b/defaut/Pretre.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(berserking 26297) SpellInfo(berserking duration=10 cd=180 ) diff --git a/defaut/Voleur.lua b/defaut/Voleur.lua index ff076bf..5a26281 100644 --- a/defaut/Voleur.lua +++ b/defaut/Voleur.lua @@ -1,3 +1,6 @@ +local _, Ovale = ... +local OvaleScripts = Ovale:GetModule("OvaleScripts") + local code = [[ Define(adrenaline_rush 13750) SpellInfo(adrenaline_rush duration=15 cd=180 ) -- 1.7.9.5