From f8580232706e2fbe10f08e533c5d8b895f2c0068 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Fri, 22 Feb 2013 09:21:38 +0000 Subject: [PATCH] Use OvaleStance instead of directly calling Blizzard API for efficiency. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@700 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleData.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OvaleData.lua b/OvaleData.lua index 12c5098..b9a36d6 100644 --- a/OvaleData.lua +++ b/OvaleData.lua @@ -11,7 +11,7 @@ OvaleData = LibStub("AceAddon-3.0"):NewAddon("OvaleData", "AceEvent-3.0") -- local ipairs, pairs, tinsert, tonumber, tostring, tsort = ipairs, pairs, table.insert, tonumber, tostring, table.sort -local GetShapeshiftForm, GetSpellBookItemInfo, GetSpellBookItemName = GetShapeshiftForm, GetSpellBookItemInfo, GetSpellBookItemName +local GetSpellBookItemInfo, GetSpellBookItemName = GetSpellBookItemInfo, GetSpellBookItemName local GetSpellInfo, GetSpellTabInfo, GetTalentInfo = GetSpellInfo, GetSpellTabInfo, GetTalentInfo local HasPetSpells, UnitBuff, UnitClass = HasPetSpells, UnitBuff, UnitClass local BOOKTYPE_SPELL, BOOKTYPE_PET = BOOKTYPE_SPELL, BOOKTYPE_PET @@ -514,10 +514,10 @@ function OvaleData:GetGCD(spellId) end -- Default value - if self.className == "ROGUE" or (self.className == "DRUID" and GetShapeshiftForm(true) == 3) then + if self.className == "ROGUE" or (self.className == "DRUID" and OvaleStance:IsStance("druid_cat_form")) then return 1.0 elseif self.className == "MAGE" or self.className == "WARLOCK" or self.className == "PRIEST" or - (self.className == "DRUID" and GetShapeshiftForm(true) ~= 1) then + (self.className == "DRUID" and not OvaleStance:IsStance("druid_bear_form")) then local cd = 1.5 / (1 + OvalePaperDoll.spellHaste) if (cd<1) then cd = 1 -- 1.7.9.5