diff --git a/FollowerPage.lua b/FollowerPage.lua
index c305683..f0d9262 100644
--- a/FollowerPage.lua
+++ b/FollowerPage.lua
@@ -190,7 +190,7 @@ end
function addon:FollowerPageStartUp()
self:RegisterEvent("GARRISON_FOLLOWER_UPGRADED","DelayedRefresh")
self:RegisterEvent("CHAT_MSG_LOOT","DelayedRefresh")
- self:GarrisonTraitCountersFrame_OnLoad(GarrisonTraitCountersFrame, GARRISON_THREAT_COUNTER_TOOLTIP .. " %d")
+ self:GarrisonTraitCountersFrame_OnLoad(GarrisonTraitCountersFrame, GARRISON_THREAT_COUNTER_TOOLTIP)
self:HookScript(GarrisonTraitCountersFrame,"OnEvent","GarrisonTraitCountersFrame_OnEvent")
self:HookScript(GarrisonTraitCountersFrame,"OnShow","GarrisonTraitCountersFrame_OnShow")
end
@@ -264,7 +264,7 @@ end
-- Need to be a global
function _G.GarrisonTraitCounter_OnEnter(this)
GameTooltip:SetOwner(this, "ANCHOR_RIGHT");
- GameTooltip:SetText(this:GetParent().tooltipString:format(this.Count:GetText(), this.name,this.id), nil, nil, nil, nil, true);
+ GameTooltip:SetText(this:GetParent().tooltipString:format(this.Count:GetText(), this.name), nil, nil, nil, nil, true);
end
function addon:FillCounters(this,category)
local i=0
diff --git a/Init.lua b/Init.lua
index 59f595d..1dc2cfc 100644
--- a/Init.lua
+++ b/Init.lua
@@ -18,7 +18,7 @@ if LibDebug then LibDebug() ns.print=print else ns.print=function() end end
--@end-debug@
--[===[@non-debug@
ns.print=function() end
---@end-non.debug@]===]
+--@end-non-debug@]===]
ns.addon=LibStub("LibInit"):NewAddon(me,'AceHook-3.0','AceTimer-3.0','AceEvent-3.0','AceBucket-3.0')
local addon=ns.addon --#addon
ns.toc=select(4,GetBuildInfo())
diff --git a/MissionControl.lua b/MissionControl.lua
index b248092..223c783 100644
--- a/MissionControl.lua
+++ b/MissionControl.lua
@@ -23,6 +23,7 @@ local dbg
local tItems = {
{t = 'Enable/Disable money rewards.', i = 'Interface\\Icons\\inv_misc_coin_01', key = 'gold'},
{t = 'Enable/Disable resource awards. (Resources/Seals)', i= 'Interface\\Icons\\inv_garrison_resource', key = 'resources'},
+ {t = 'Enable/Disable oil awards.', i= 'Interface\\Icons\\garrison_oil', key = 'oil'},
{t = 'Enable/Disable rush scroll.', i= 'Interface\\ICONS\\INV_Scroll_12', key = 'rush'},
{t = 'Enable/Disable Follower XP Bonus rewards.', i = 'Interface\\Icons\\XPBonus_Icon', key = 'xp'},
{t = 'Enable/Disable follower equip enhancement.', i = 'Interface\\ICONS\\Garrison_ArmorUpgrade', key = 'followerUpgrade'},
@@ -33,9 +34,6 @@ local tItems = {
local tOrder
local tSort={}
local settings
-if (ns.toc >=60200) then
- tinsert(tItems,3,{t = 'Enable/Disable oil awards.', i= 'Interface\\Icons\\garrison_oil', key = 'oil'})
-end
local module=addon:NewSubClass("MissionControl") --#module
function module:GMCBusy(followerID)
return GMCUsedFollowers[followerID]
@@ -252,6 +250,9 @@ local function drawItemButtons()
frame.key=tItems[i].key
tSort[frame.key]=j
frame.tooltip=tItems[i].t
+ if ns.toc<60200 and frame.key=="oil" then
+ GMC.settings.allowedRewards[frame.key]=false
+ end
frame.allowed=GMC.settings.allowedRewards[frame.key]
frame.chance=GMC.settings.rewardChance[frame.key]
frame.icon:SetDesaturated(not frame.allowed)
@@ -368,9 +369,8 @@ function module:OnInitialized()
settings.allowedRewards['followerUpgrade']=settings.allowedRewards['followerUpgrade']
settings.allowedRewards['followerEquip']=nil
end
-
- if true then
- tOrder=GMC.settings.rewardOrder
+ tOrder=GMC.settings.rewardOrder
+ if false then
local aa={}
for k,v in pairs(tOrder) do aa[k]=v end
for k,v in pairs(aa) do tOrder[k]=nil end