WoWInterface SVN FuryCommander

Compare Revisions

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

Rev 13 → Rev 14

trunk/Config.lua
222,7 → 222,7
get = function(info) return FuryCommander_Save.display.EXEC end
},
RENDShow = {--Show REND
order = 151,
order = 155,
name = "Show Rend icon",
desc = "Display the Rend icon",
type = "toggle",
231,6 → 231,27
end,
get = function(info) return FuryCommander_Save.display.REND end
},
MSShow = {--Show Mortal strike
order = 156,
name = "Show Mortal srike icon",
desc = "Display the Mortal srike icon",
type = "toggle",
set = function(info,val)
FuryCommander_Save.display.MS = val
end,
get = function(info) return FuryCommander_Save.display.MS end
},
OPShow = {--Show Overpower
order = 157,
name = "Show Overpower icon",
desc = "Display the Overpower icon",
type = "toggle",
set = function(info,val)
FuryCommander_Save.display.OP = val
end,
get = function(info) return FuryCommander_Save.display.OP end
},
}
}
 
SC_OptionsTable = {
494,6 → 515,14
 
--Create Rend icon
FC.ICON['REND']['obj'], FC.ICON['REND']['frame'] = FuryCommander:NewIcon("Interface\\Icons\\ability_gouge", FC.ICON['REND']['name'], FuryCommander_Save.Rend.point, FuryCommander_Save.Rend.relativeTo, FuryCommander_Save.Rend.relativePoint, FuryCommander_Save.Rend.xOfs, FuryCommander_Save.Rend.yOfs)
FC.ICON['REND']['obj'].overlay:SetBackdropColor(0,0,0,.7)
 
--Create Mortal srike icon
FC.ICON['MS']['obj'], FC.ICON['MS']['frame'] = FuryCommander:NewIcon("Interface\\Icons\\ability_warrior_savageblow", FC.ICON['MS']['name'], FuryCommander_Save.mortalstrike.point, FuryCommander_Save.mortalstrike.relativeTo, FuryCommander_Save.mortalstrike.relativePoint, FuryCommander_Save.mortalstrike.xOfs, FuryCommander_Save.mortalstrike.yOfs)
 
--Create Mortal srike icon
FC.ICON['OP']['obj'], FC.ICON['OP']['frame'] = FuryCommander:NewIcon("Interface\\Icons\\ability_meleedamage", FC.ICON['OP']['name'], FuryCommander_Save.Overpower.point, FuryCommander_Save.Overpower.relativeTo, FuryCommander_Save.Overpower.relativePoint, FuryCommander_Save.Overpower.xOfs, FuryCommander_Save.Overpower.yOfs)
FC.ICON['OP']['obj'].overlay:Hide()
 
FC.BARS['THREAT']['obj'].iconBackground:SetAlpha(0)--Hide icone for Threat bar
for i,v in pairs(FC.BARS['THREAT']['obj'].iconBorder) do
522,9 → 551,15
if FuryCommander_Save.Execution == nil then
FuryCommander_Save.Execution = { }
end
if FuryCommander_Save.mortalstrike == nil then
FuryCommander_Save.mortalstrike = { }
end
if FuryCommander_Save.Rend == nil then
FuryCommander_Save.Rend = { }
end
if FuryCommander_Save.Overpower == nil then
FuryCommander_Save.Overpower = { }
end
if FuryCommander_Save.IsLocked == nil then
FuryCommander_Save.IsLocked = true
end
672,6 → 707,36
if FuryCommander_Save.Rend.yOfs == nil then
FuryCommander_Save.Rend.yOfs = -600
end
if FuryCommander_Save.mortalstrike.point == nil then
FuryCommander_Save.mortalstrike.point = "TOP"
end
--if FuryCommander_Save.mortalstrike.relativeTo == nil then
FuryCommander_Save.mortalstrike.relativeTo = "UIParent"
--end
if FuryCommander_Save.mortalstrike.relativePoint == nil then
FuryCommander_Save.mortalstrike.relativePoint = "TOP"
end
if FuryCommander_Save.mortalstrike.xOfs == nil then
FuryCommander_Save.mortalstrike.xOfs = 0
end
if FuryCommander_Save.mortalstrike.yOfs == nil then
FuryCommander_Save.mortalstrike.yOfs = -550
end
if FuryCommander_Save.Overpower.point == nil then
FuryCommander_Save.Overpower.point = "TOP"
end
--if FuryCommander_Save.Overpower.relativeTo == nil then
FuryCommander_Save.Overpower.relativeTo = "UIParent"
--end
if FuryCommander_Save.Overpower.relativePoint == nil then
FuryCommander_Save.Overpower.relativePoint = "TOP"
end
if FuryCommander_Save.Overpower.xOfs == nil then
FuryCommander_Save.Overpower.xOfs = 0
end
if FuryCommander_Save.Overpower.yOfs == nil then
FuryCommander_Save.Overpower.yOfs = -550
end
if FuryCommander_Save.skin == nil then
FuryCommander_Save.skin = true
end
705,6 → 770,12
if FuryCommander_Save.display.REND == nil then
FuryCommander_Save.display.REND = true
end
if FuryCommander_Save.display.MS == nil then
FuryCommander_Save.display.MS = true
end
if FuryCommander_Save.display.OP == nil then
FuryCommander_Save.display.OP = true
end
end
 
function FuryCommander:ResetOptions()
791,6 → 862,10
FC.ICON['EXEC']['frame']:EnableMouse(false)
FC.ICON['REND']['frame']:SetAlpha(0)
FC.ICON['REND']['frame']:EnableMouse(false)
FC.ICON['MS']['frame']:SetAlpha(0)
FC.ICON['MS']['frame']:EnableMouse(false)
FC.ICON['OP']['frame']:SetAlpha(0)
FC.ICON['OP']['frame']:EnableMouse(false)
FuryCommanderFrame:SetAlpha(0)
FuryCommanderFrame:EnableMouse(false)
FuryCommander_Save.IsLocked = true
805,6 → 880,10
FC.ICON['EXEC']['frame']:EnableMouse(true)
FC.ICON['REND']['frame']:SetAlpha(.5)
FC.ICON['REND']['frame']:EnableMouse(true)
FC.ICON['MS']['frame']:SetAlpha(.5)
FC.ICON['MS']['frame']:EnableMouse(true)
FC.ICON['OP']['frame']:SetAlpha(.5)
FC.ICON['OP']['frame']:EnableMouse(true)
FuryCommanderFrame:SetAlpha(.5)
FuryCommanderFrame:EnableMouse(true)
FuryCommander_Save.IsLocked = false
trunk/Localization.lua
17,6 → 17,8
FC_SPELL_DW = GetSpellInfo(12292)
FC_SPELL_EXE = GetSpellInfo(20503)
FC_SPELL_REND = GetSpellInfo(772)
FC_SPELL_MS = GetSpellInfo(12294)
FC_SPELL_OP = GetSpellInfo(7384)
--/script start, duration, enabled = GetSpellCooldown(GetSpellInfo(23881)); print(start..' = '.. duration ..' = ' .. enabled)
 
SC_SPELL_SND = GetSpellInfo(5171);
trunk/FuryCommander.lua
44,6 → 44,16
['expire'] = 0,
['name'] = FC_SPELL_REND
},
['MS'] = {
['obj'] = 0,
['frame'] = 0,
['name'] = FC_SPELL_MS
},
['OP'] = {
['obj'] = 0,
['frame'] = 0,
['name'] = FC_SPELL_OP
},
['HEALTH'] = {
['obj'] = 0
},
81,6 → 91,8
FuryCommander_Save.ColossusSmash.point, FuryCommander_Save.ColossusSmash.relativeTo, FuryCommander_Save.ColossusSmash.relativePoint, FuryCommander_Save.ColossusSmash.xOfs, FuryCommander_Save.ColossusSmash.yOfs = FC.ICON['CSM']['frame']:GetPoint()
FuryCommander_Save.RagingBlow.point, FuryCommander_Save.RagingBlow.relativeTo, FuryCommander_Save.RagingBlow.relativePoint, FuryCommander_Save.RagingBlow.xOfs, FuryCommander_Save.RagingBlow.yOfs = FC.ICON['RGB']['frame']:GetPoint()
FuryCommander_Save.Execution.point, FuryCommander_Save.Execution.relativeTo, FuryCommander_Save.Execution.relativePoint, FuryCommander_Save.Execution.xOfs, FuryCommander_Save.Execution.yOfs = FC.ICON['EXEC']['frame']:GetPoint()
FuryCommander_Save.mortalstrike.point, FuryCommander_Save.mortalstrike.relativeTo, FuryCommander_Save.mortalstrike.relativePoint, FuryCommander_Save.mortalstrike.xOfs, FuryCommander_Save.mortalstrike.yOfs = FC.ICON['MS']['frame']:GetPoint()
FuryCommander_Save.Overpower.point, FuryCommander_Save.Overpower.relativeTo, FuryCommander_Save.Overpower.relativePoint, FuryCommander_Save.Overpower.xOfs, FuryCommander_Save.Overpower.yOfs = FC.ICON['OP']['frame']:GetPoint()
FuryCommander_Save.Rend.point, FuryCommander_Save.Rend.relativeTo, FuryCommander_Save.Rend.relativePoint, FuryCommander_Save.Rend.xOfs, FuryCommander_Save.Rend.yOfs = FC.ICON['REND']['frame']:GetPoint()
end
end
706,10 → 718,22
FC.ICON['BLT']['obj']:Hide()
FC.ICON['CSM']['obj']:Hide()
FC.ICON['RGB']['obj']:Hide()
FC.ICON['REND']['obj']:Hide()
FC.ICON['MS']['obj']:Hide()
else
VTimerRage:SetAlpha(FuryCommander_Save.FrameOpacity)
FC.ICON['BLT']['obj']:Show()
FC.ICON['CSM']['obj']:Show()
if FuryCommander_Save.display.BLT then
FC.ICON['BLT']['obj']:Show()
end
if FuryCommander_Save.display.CSM then
FC.ICON['CSM']['obj']:Show()
end
if FuryCommander_Save.display.REND then
FC.ICON['REND']['obj']:Show()
end
if FuryCommander_Save.display.MS then
FC.ICON['MS']['obj']:Show()
end
end
if currentRage < 20 then
FC.ICON['BLT']['obj'].overlay:SetBackdropColor(.1,.1,.8,.5)
718,17 → 742,29
FC.ICON['CSM']['obj'].overlay:Show()
FC.ICON['RGB']['obj'].overlay:SetBackdropColor(.1,.1,.8,.5)
FC.ICON['RGB']['obj'].overlay:Show()
FC.ICON['MS']['obj'].overlay:SetBackdropColor(.1,.1,.8,.5)
FC.ICON['MS']['obj'].overlay:Show()
else
FC.ICON['BLT']['obj'].overlay:SetBackdropColor(0,0,0,.7)
FC.ICON['CSM']['obj'].overlay:SetBackdropColor(0,0,0,.7)
FC.ICON['RGB']['obj'].overlay:SetBackdropColor(0,0,0,.7)
FC.ICON['MS']['obj'].overlay:SetBackdropColor(0,0,0,.7)
end
if currentRage < 10 then
FC.ICON['EXEC']['obj'].overlay:SetBackdropColor(.1,.1,.8,.5)
FC.ICON['EXEC']['obj'].overlay:Show()
FC.ICON['REND']['obj'].overlay:SetBackdropColor(.1,.1,.8,.5)
FC.ICON['REND']['obj'].overlay:Show()
else
FC.ICON['EXEC']['obj'].overlay:SetBackdropColor(0,0,0,.7)
FC.ICON['REND']['obj'].overlay:SetBackdropColor(0,0,0,.7)
end
if currentRage < 5 then
--FC.ICON['OP']['obj'].overlay:SetBackdropColor(.1,.1,.8,.5)
--FC.ICON['OP']['obj'].overlay:Show()
else
--FC.ICON['OP']['obj'].overlay:SetBackdropColor(0,0,0,.7)
end
end
 
function FuryCommander:IconWithCD(ICON, display)
770,16 → 806,16
 
function FuryCommander:IconWithTimer(ICON, display)
if display then
local last = BAR['expire'];
_, _, _, _, _, _, BAR['expire'], unitCaster = UnitDebuff("target", BAR['name'], nil, "PLAYER")
local last = ICON['expire'];
_, _, _, _, _, _, ICON['expire'], unitCaster = UnitDebuff("target", ICON['name'], nil, "PLAYER")
if unitCaster ~= "player" and unitCaster ~= nil then
BAR['expire'] = last
ICON['expire'] = last
end
if BAR['expire'] == nil then
BAR['expire'] = 0
if ICON['expire'] == nil then
ICON['expire'] = 0
end
if BAR['expire'] > 0 and FC.tNow < BAR['expire'] then
x = BAR['expire'] - FC.tNow
if ICON['expire'] > 0 and FC.tNow < ICON['expire'] then
x = ICON['expire'] - FC.tNow
else
x = 0
end
792,9 → 828,6
else
ICON['obj'].iconTxt:SetText(string.format("%0.1f", x))
end
if not ICON['obj']:IsVisible() then
ICON['obj']:Show()
end
else
ICON['obj'].iconTxt:SetText('')
if ICON['obj'].overlay:IsVisible() then
861,8 → 894,9
b.border[1]:SetBackdropColor(unpack(FC.V.brColor))
b.border[2]:SetBackdropColor(unpack(FC.V.yeColor))
b.border[3]:SetBackdropColor(unpack(FC.V.brColor))
--FuryCommander_Combo:SetText(string.format("%0.1f", enrageTime))
b:Show()
if FuryCommander_Save.display.RGB then
b:Show()
end
else
b.border[1]:SetBackdropColor(unpack(FC.V.bColor))
b.border[2]:SetBackdropColor(unpack(FC.V.wColor))
874,6 → 908,25
end
end
 
function FuryCommander:ColorOPBorder(b)
local enabled = IsUsableSpell(b.name);
if enabled ~= nil then
b['obj'].border[1]:SetBackdropColor(unpack(FC.V.brColor))
b['obj'].border[2]:SetBackdropColor(unpack(FC.V.yeColor))
b['obj'].border[3]:SetBackdropColor(unpack(FC.V.brColor))
if FuryCommander_Save.display.OP then
b['obj']:Show()
end
else
b['obj'].border[1]:SetBackdropColor(unpack(FC.V.bColor))
b['obj'].border[2]:SetBackdropColor(unpack(FC.V.wColor))
b['obj'].border[3]:SetBackdropColor(unpack(FC.V.bColor))
if b['obj'].iconTxt:GetText() == nil then
b['obj']:Hide()
end
end
end
 
function FuryCommander:OnUpdate()
FuryCommander:Rage()--Update energy value and play sound if necessary
FuryCommander:Latency()--Update timer reference and latency
882,11 → 935,11
FuryCommander:IconWithCD(FC.ICON['BLT'], FuryCommander_Save.display.BLT)
FuryCommander:IconWithCD(FC.ICON['CSM'], FuryCommander_Save.display.CSM)
FuryCommander:IconWithCD(FC.ICON['RGB'], FuryCommander_Save.display.RGB)
FuryCommander:IconWithCD(FC.ICON['MS'], FuryCommander_Save.display.MS)
 
FuryCommander:ColorOPBorder(FC.ICON['OP'], FuryCommander_Save.display.OP)
FuryCommander:IconWithTimer(FC.ICON['REND'], FuryCommander_Save.display.REND)
 
FuryCommander:IconWithCount(FC.ICON['EXEC'], FuryCommander_Save.display.EXEC)
 
FuryCommander:ColorEnrageBorder(FC.ICON['RGB']['obj'])
 
FuryCommander:UpdateBar(FC.BARS['ENR'], FuryCommander_Save.display.ENR, false)--Update Enrage Bar