WoWInterface SVN FuryCommander

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 14 to Rev 15
    ↔ Reverse comparison
  •

Rev 14 → Rev 15

trunk/Config.lua
134,6 → 134,38
end,
get = function(info) return FuryCommander_Save.Pos.ENR end
},
headerCSMSetting = {--Colossus smash Settings
order = 115,
name = "Colossus Smash Settings",
type = "header"
},
CSMBarShow = {--Show Colossus smash
order = 116,
name = "Show Colossus Smash bar",
desc = "Display the Colossus Smash timer bar",
type = "toggle",
set = function(info,val)
FuryCommander_Save.display.CSMB = val
end,
get = function(info) return FuryCommander_Save.display.CSMB end
},
PosCSM = {--Colossus smash position
order = 117,
name = "Colossus Smash bar position",
desc = "The place where to display the Colossus Smash bar",
type = "select",
values = function()
returnArray = {}
for key = -15, 15, 1 do
returnArray[key] = key
end
return returnArray
end,
set = function(info,val)
FuryCommander_Save.Pos.CSM = val
end,
get = function(info) return FuryCommander_Save.Pos.CSM end
},
headerThreatSetting = {--Threat Settings
order = 133,
name = "Threat bar Settings",
499,7 → 531,8
FuryCommander:CreateCore()
 
FC.BARS['THREAT']['obj'] = FuryCommander:NewFrame(0, 0, 0)
FC.BARS['ENR']['obj'] = FuryCommander:NewFrame(110/255, 34/255, 45/255)
FC.BARS['ENR']['obj'] = FuryCommander:NewFrame(.43, .13, .18)
FC.BARS['CSM']['obj'] = FuryCommander:NewFrame(.71, .45, .04)
 
--Create Bloodthirst icon
FC.ICON['BLT']['obj'], FC.ICON['BLT']['frame'] = FuryCommander:NewIcon("Interface\\Icons\\spell_nature_bloodlust", FC.ICON['BLT']['name'], FuryCommander_Save.bloodthirst.point, FuryCommander_Save.bloodthirst.relativeTo, FuryCommander_Save.bloodthirst.relativePoint, FuryCommander_Save.bloodthirst.xOfs, FuryCommander_Save.bloodthirst.yOfs)
749,6 → 782,12
if FuryCommander_Save.Pos.ENR == nil then
FuryCommander_Save.Pos.ENR = 1
end
if FuryCommander_Save.display.CSMB == nil then
FuryCommander_Save.display.CSMB = true
end
if FuryCommander_Save.Pos.CSM == nil then
FuryCommander_Save.Pos.CSM = 2
end
if FuryCommander_Save.display.THREAT == nil then
FuryCommander_Save.display.THREAT = true
end
trunk/FuryCommander.lua
73,6 → 73,14
},
['type'] = 1
},
['CSM'] = {
['obj'] = 0,
['expire'] = 0,
['name'] = {
FC_SPELL_CSM
},
['type'] = 2
},
}
end
 
142,6 → 150,11
FC.BARS['ENR']['obj']:SetPoint(AnchorFromPos, LastAnchorPos, AnchorToPos, 0, offSetSize*-1)
LastAnchorPos = FC.BARS['ENR']['obj']
end
if FuryCommander_Save.Pos.CSM == i and FC.BARS['CSM']['expire'] ~= 0 then
FC.BARS['CSM']['obj']:ClearAllPoints()
FC.BARS['CSM']['obj']:SetPoint(AnchorFromPos, LastAnchorPos, AnchorToPos, 0, offSetSize*-1)
LastAnchorPos = FC.BARS['CSM']['obj']
end
 
--on top
if FuryCommander_Save.Pos.THREAT == i*-1 and FC.BARS['THREAT']['expire'] ~= 0 then
154,6 → 167,11
FC.BARS['ENR']['obj']:SetPoint(AnchorFromNeg, LastAnchorNeg, AnchorToNeg, 0, offSetSize)
LastAnchorNeg = FC.BARS['ENR']['obj']
end
if FuryCommander_Save.Pos.CSM == i*-1 and FC.BARS['CSM']['expire'] ~= 0 then
FC.BARS['CSM']['obj']:ClearAllPoints()
FC.BARS['CSM']['obj']:SetPoint(AnchorFromNeg, LastAnchorNeg, AnchorToNeg, 0, offSetSize)
LastAnchorNeg = FC.BARS['CSM']['obj']
end
end
end
 
580,7 → 598,7
BAR['expire'] = last
end
 
if BAR['expire'] == nil then
if BAR['expire'] == nil or BAR['expire'] == -1 then
BAR['expire'] = 0
end
if FC.tNow == nil then
943,6 → 961,7
FuryCommander:ColorEnrageBorder(FC.ICON['RGB']['obj'])
 
FuryCommander:UpdateBar(FC.BARS['ENR'], FuryCommander_Save.display.ENR, false)--Update Enrage Bar
FuryCommander:UpdateBar(FC.BARS['CSM'], FuryCommander_Save.display.CSMB, false)--Update Enrage Bar
end
 
do