WoWInterface SVN FuryCommander

Compare Revisions

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

Rev 15 → Rev 16

trunk/Config.lua
253,16 → 253,6
end,
get = function(info) return FuryCommander_Save.display.EXEC end
},
RENDShow = {--Show REND
order = 155,
name = "Show Rend icon",
desc = "Display the Rend icon",
type = "toggle",
set = function(info,val)
FuryCommander_Save.display.REND = val
end,
get = function(info) return FuryCommander_Save.display.REND end
},
MSShow = {--Show Mortal strike
order = 156,
name = "Show Mortal srike icon",
546,10 → 536,6
--Create Execution icon
FC.ICON['EXEC']['obj'], FC.ICON['EXEC']['frame'] = FuryCommander:NewIcon("Interface\\Icons\\inv_sword_48", FC.ICON['EXEC']['name'], FuryCommander_Save.Execution.point, FuryCommander_Save.Execution.relativeTo, FuryCommander_Save.Execution.relativePoint, FuryCommander_Save.Execution.xOfs, FuryCommander_Save.Execution.yOfs)
 
--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)
 
806,9 → 792,6
if FuryCommander_Save.display.EXEC == nil then
FuryCommander_Save.display.EXEC = true
end
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
899,8 → 882,6
FC.ICON['RGB']['frame']:EnableMouse(false)
FC.ICON['EXEC']['frame']:SetAlpha(0)
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)
917,8 → 898,6
FC.ICON['RGB']['frame']:EnableMouse(true)
FC.ICON['EXEC']['frame']:SetAlpha(.5)
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)
trunk/Localization.lua
12,11 → 12,10
FC_SPELL_BLT = GetSpellInfo(23881)
FC_SPELL_CSM = GetSpellInfo(86346)
FC_SPELL_RGB = GetSpellInfo(85288)
FC_SPELL_ENR = GetSpellInfo(14202)
FC_SPELL_ENR = GetSpellInfo(12880)
FC_SPELL_RBE = GetSpellInfo(18499)
FC_SPELL_DW = GetSpellInfo(12292)
FC_SPELL_EXE = GetSpellInfo(20503)
FC_SPELL_REND = GetSpellInfo(772)
FC_SPELL_EXE = GetSpellInfo(5308)
FC_SPELL_MS = GetSpellInfo(12294)
FC_SPELL_OP = GetSpellInfo(7384)
--/script start, duration, enabled = GetSpellCooldown(GetSpellInfo(23881)); print(start..' = '.. duration ..' = ' .. enabled)
trunk/FuryCommander.lua
38,12 → 38,6
['expire'] = 0,
['name'] = FC_SPELL_EXE
},
['REND'] = {
['obj'] = 0,
['frame'] = 0,
['expire'] = 0,
['name'] = FC_SPELL_REND
},
['MS'] = {
['obj'] = 0,
['frame'] = 0,
101,7 → 95,7
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
 
651,8 → 645,8
end
 
function FuryCommander:UNIT_HEALTH()
if (GetActiveTalentGroup(false,false) == 1 and FuryCommander_Save.checkHealthSpec1)
or (GetActiveTalentGroup(false,false) == 2 and FuryCommander_Save.checkHealthSpec2) then
if (GetActiveSpecGroup(false,false) == 1 and FuryCommander_Save.checkHealthSpec1)
or (GetActiveSpecGroup(false,false) == 2 and FuryCommander_Save.checkHealthSpec2) then
HP = UnitHealth("target")
maxHP = UnitHealthMax("target")
if HP ~= 0 and maxHP ~= 0 and not UnitIsFriend("player","target")then
675,7 → 669,7
end
 
function FuryCommander:TargetThreat()
if FuryCommander_Save.display.THREAT == false or (FuryCommander_Save.ThreatGroupOnly and GetNumRaidMembers() == 0 and GetNumPartyMembers() == 0) then
if FuryCommander_Save.display.THREAT == false or (FuryCommander_Save.ThreatGroupOnly and IsInRaid() == false and IsInGroup() == false) then
FC.BARS['THREAT']['expire'] = 0
else
isTanking, status, threatpct, rawthreatpct, threatvalue = UnitDetailedThreatSituation("player", "target")
736,7 → 730,6
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)
746,9 → 739,6
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
771,11 → 761,8
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)
956,7 → 943,6
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'])