WoWInterface SVN SliceCommander

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk/Core
    from Rev 247 to Rev 246
    ↔ Reverse comparison
  •

Rev 247 → Rev 246

Settings.lua
1068,7 → 1068,6
Shortcut_BE = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Skills", "BE"),
Shortcut_GHCD = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Skills", "GHCD"),
Shortcut_OP = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Skills", "OP"),
Shortcut_GG = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Skills", "GG"),
RB = {
name = SC_SPELL['RB'],
type = "group",
1100,7 → 1099,41
}
)
},
BF = SliceCommander:getSpellCDSettings('BF'),
BF = {
order = SliceCommander:getOrder(),
name = SC_SPELL['BF'],
type = "group",
args = {
header = {
type = "header",
order = SliceCommander:getOrder(),
name = L['Spell'],
},
BFShow = SliceCommander:getShowSetting('BF'),
BFColor = SliceCommander:getColorSetting('BF'),
BFPos = SliceCommander:getPosSetting('BF'),
Flash = SliceCommander:getFlashSetting('BF'),
BFIcon = {
order = SliceCommander:getOrder(),
name = string.format(L["Show %s icon"], SC_SPELL['BF']),
desc = string.format(L["Display the %s icon when enbale"], SC_SPELL['BF']),
type = "toggle",
set = function(info,val)
SC.SET.display.BFICON = val
end,
get = function(info) return SC.SET.display.BFICON end
},
headerCD = {
type = "header",
order = SliceCommander:getOrder(),
name = L['Cooldown'],
},
BFCDShow = SliceCommander:getShowSetting('BFCD'),
BFCDColor = SliceCommander:getColorSetting('BFCD'),
BFCDPos = SliceCommander:getPosSetting('BFCD'),
FlashCD = SliceCommander:getFlashSetting('BFCD')
}
},
AR = {
order = SliceCommander:getOrder(),
name = SC_SPELL['AR'],
1306,7 → 1339,36
childGroups = "tree",
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_FOTD = SliceCommander:getShortcutSetting("SliceCommander_Complementary", "General", "FOTD"),
Shortcut_MAI = SliceCommander:getShortcutSetting("SliceCommander_Complementary", "General", "MAI"),
FOTD = {
order = SliceCommander:getOrder(),
name = SC_SPELL['FOTD'],
type = "group",
args = {
header = {
type = "header",
order = SliceCommander:getOrder(),
name = L['Spell'],
},
Show = SliceCommander:getShowSetting('FOTD'),
Pos = SliceCommander:getPosSetting('FOTD'),
Color = SliceCommander:getColorSetting('FOTD'),
Flash = SliceCommander:getFlashSetting('FOTD'),
Icon = {--Shadow of the destroyer icon
order = SliceCommander:getOrder(),
name = string.format(L["%s icon"], SC_SPELL['SOTD']),
desc = string.format(L["%s icon. It's only display when stack reach 30. There is a counter on it."], SC_SPELL['SOTD']),
type = "toggle",
set = function(info,val)
SC.SET.display.SOTD = val
end,
get = function(info)
return SC.SET.display.SOTD
end
},
}
},
MAI = SliceCommander:getSpellSettings('MAI'),
}
},
1332,7 → 1394,26
childGroups = "tree",
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_BB = SliceCommander:getShortcutSetting("SliceCommander_Complementary", "Outlaw", "BB"),
Shortcut_GSWW = SliceCommander:getShortcutSetting("SliceCommander_Complementary", "Outlaw", "GSWW"),
BB = {
order = SliceCommander:getOrder(),
name = SC_SPELL['BB'],
type = "group",
args = {
BBShow = {
order = SliceCommander:getOrder(),
name = string.format(L["Show %s icon"], SC_SPELL['BB']),
desc = string.format(L["Display the %s icon when enbale"], SC_SPELL['BB']),
width = "full",
type = "toggle",
set = function(info,val)
SC.SET.display.BB = val
end,
get = function(info) return SC.SET.display.BB end
}
}
},
GSWW = SliceCommander:getSpellSettings('GSWW'),
}
},
Event.lua
189,5 → 189,8
end
end
 
SliceCommander:TestSOTD()--SOTD Icon
SliceCommander:TestBF()--BF Icon
SliceCommander:TestBB()--BB Icon
SliceCommander:TestDP()--DP Icon
end
\ No newline at end of file
Config.lua
107,6 → 107,10
SC.OTHER['POISON']['obj'].button:SetAttribute("*type1", "spell")
SC.OTHER['POISON']['obj'].button:SetAttribute("*type2", "spell")
SC.OTHER['POISON']['obj'].button:EnableMouse(false)
SC.OTHER['BF']['obj'] = SliceCommander:NewIcon("Interface\\Icons\\Ability_Warrior_PunishingBlow", 'BF')--Create Blade fury icon display when BF is enable
SC.OTHER['BB']['obj'] = SliceCommander:NewIcon("Interface\\Icons\\inv_weapon_rifle_07", 'BB')--Create Blunderbuss icon display when BF is enable
SC.OTHER['SOTD']['obj'] = SliceCommander:NewIcon("Interface\\Icons\\inv_misc_volatileshadow", 'SOTD')--Create Shadow of the destroyer icon display when stack rise 30
SC.OTHER['SOTD']['obj'].overlay:Show()
end
 
function SliceCommander:InitGCDBar()
286,6 → 290,12
SliceCommanderFrame:EnableMouse(false)
SC.OTHER['POISON']['obj']['moveframe']:SetAlpha(0)
SC.OTHER['POISON']['obj']['moveframe']:EnableMouse(false)
SC.OTHER['BF']['obj']['moveframe']:SetAlpha(0)
SC.OTHER['BF']['obj']['moveframe']:EnableMouse(false)
SC.OTHER['BB']['obj']['moveframe']:SetAlpha(0)
SC.OTHER['BB']['obj']['moveframe']:EnableMouse(false)
SC.OTHER['SOTD']['obj']['moveframe']:SetAlpha(0)
SC.OTHER['SOTD']['obj']['moveframe']:EnableMouse(false)
SC.SET.IsLocked = true
else
SliceCommander:SetTransparency(100)
295,6 → 305,15
SC.OTHER['POISON']['obj']['moveframe']:EnableMouse(true)
SC.OTHER['POISON']['obj']:SetAlpha(1)
SC.OTHER['POISON']['obj']:Show()
SC.OTHER['BF']['obj']['moveframe']:SetAlpha(.5)
SC.OTHER['BF']['obj']['moveframe']:EnableMouse(true)
SC.OTHER['BF']['obj']:Show()
SC.OTHER['BB']['obj']['moveframe']:SetAlpha(.5)
SC.OTHER['BB']['obj']['moveframe']:EnableMouse(true)
SC.OTHER['BB']['obj']:Show()
SC.OTHER['SOTD']['obj']['moveframe']:SetAlpha(.5)
SC.OTHER['SOTD']['obj']['moveframe']:EnableMouse(true)
SC.OTHER['SOTD']['obj']:Show()
SC.SET.IsLocked = false
SliceCommander:StaticPopup_Show('CONFIG_UNLOCK')
end
389,6 → 408,9
 
function SliceCommander:SetIconSize(w)
SliceCommander:SetIconSizeObj(SC.OTHER['POISON']['obj'], w)
SliceCommander:SetIconSizeObj(SC.OTHER['BF']['obj'], w)
SliceCommander:SetIconSizeObj(SC.OTHER['BB']['obj'], w)
SliceCommander:SetIconSizeObj(SC.OTHER['SOTD']['obj'], w)
end
 
function SliceCommander:SetIconSizeObj(obj, w)
447,6 → 469,9
v['obj']:SetAlpha(opValue/100)
end
end
 
SC.OTHER['BF']['obj']:SetAlpha(opValue/100)
SC.OTHER['BB']['obj']:SetAlpha(opValue/100)
end
 
function SliceCommander:TestCurrentVersion()
488,10 → 513,6
_G['SC'].BARS['TXB'] = nil
_G['SC'].SET.Pos['NB'] = nil
_G['SC'].BARS['NB'] = nil
_G['SC'].SET.Pos['SOTD'] = nil
_G['SC'].BARS['SOTD'] = nil
_G['SC'].SET.Pos['FOTD'] = nil
_G['SC'].BARS['FOTD'] = nil
end
 
_G['SC'].version = GetAddOnMetadata("SliceCommander", "Version")
556,7 → 577,7
end
 
function SliceCommander:Global()
SliceCommander:DisplaySpells({'CP', 'THREAT', 'SND', 'CS', 'KS', 'KSCD', 'CV', 'CVCD', 'TOTCD', 'FE', 'SSCD', 'SUB', 'CDCD', 'AC', 'MDCD', 'DFACD', 'Poison', 'MAI', 'FECD', 'ESSECD', 'DPICON', 'SUMSCD', 'FCCD', 'SOSCD', 'DOSCD', 'ERCD', 'SBSCD', 'SBS', 'SPCD', 'FLACD', 'SP', 'FLA'})
SliceCommander:DisplaySpells({'CP', 'THREAT', 'SND', 'CS', 'KS', 'KSCD', 'FOTD', 'CV', 'CVCD', 'TOTCD', 'FE', 'SSCD', 'SUB', 'CDCD', 'AC', 'MDCD', 'DFACD', 'Poison', 'SOTD', 'MAI', 'FECD', 'ESSECD', 'DPICON', 'SUMSCD', 'FCCD', 'SOSCD', 'DOSCD', 'ERCD', 'SBSCD', 'SBS', 'SPCD', 'FLACD', 'SP', 'FLA'})
SliceCommander:NotDisplaySpells({'HEALTH', 'THEALTH', 'VANCD', 'KICD', 'COS', 'COSCD', 'EVA', 'EVACD', 'SPR', 'SPRCD', 'SS'})
 
SliceCommander:FlashSpells({'SND'})
569,7 → 590,7
SC.SET.Pos.CP = -1
end
 
SliceCommander:OrderSpells({'SND', 'CV', 'FE', 'SUB', 'AC', 'MAI', 'COS', 'EVA', 'SPR', 'SS', 'SP', 'FLA', 'SBS'})
SliceCommander:OrderSpells({'SND', 'FOTD', 'CV', 'FE', 'SUB', 'AC', 'MAI', 'COS', 'EVA', 'SPR', 'SS', 'SP', 'FLA', 'SBS'})
SliceCommander:OrderCDs({'CVCD', 'TOTCD', 'VANCD', 'SSCD', 'CDCD', 'MDCD', 'DFACD', 'THREAT', 'HEALTH', 'THEALTH', 'CS', 'KS', 'KSCD', 'KICD', 'COSCD', 'EVACD', 'SPRCD', 'FECD', 'ESSECD', 'SUMSCD', 'FCCD', 'SOSCD', 'DOSCD', 'ERCD', 'SBSCD', 'SPCD', 'FLACD'})
end
 
588,7 → 609,7
end
 
function SliceCommander:Outlaw()
SliceCommander:DisplaySpells({'RB', 'AR', 'ARCD', 'CDB', 'CDBCD', 'KSPCD', 'GS', 'GHCD', 'BE', 'BECD', 'BF', 'BFCD', 'OP', 'GSWW', 'LD', 'GSCD', 'BRCD', 'RBCD'})
SliceCommander:DisplaySpells({'RB', 'AR', 'ARCD', 'CDB', 'CDBCD', 'KSPCD', 'GS', 'GHCD', 'BE', 'BECD', 'BF', 'BFCD', 'OP', 'GSWW', 'BB', 'LD', 'GSCD', 'BRCD', 'RBCD'})
SliceCommander:NotDisplaySpells({'BFICON', 'GG', 'GGCD'})
 
SliceCommander:FlashSpells({'ARCD', 'CDBCD', 'KSPCD', 'BECD', 'BRCD', 'RBCD'})
764,6 → 785,9
if SC.SET.DPSound == nil then
SC.SET.DPSound = 'None'
end
if SC.SET.FOTDSound == nil then
SC.SET.FOTDSound = 'OH YEAH'
end
if SC.SET.Width == nil then
SC.SET.Width = 287
end
847,6 → 871,44
if SC.OTHER == nil then
SC.OTHER = {}
end
if SC.OTHER['BF'] == nil or SC.OTHER['BF']['position'] == nil then
SC.OTHER['BF'] = {
['obj'] = 0,
['position'] = {
['xOfs'] = 75,
['yOfs'] = 150,
['relativePoint'] = "CENTER",
['point'] = "CENTER",
['relativeTo'] = "UIParent"
}
}
end
if SC.OTHER['BB'] == nil or SC.OTHER['BB']['position'] == nil then
SC.OTHER['BB'] = {
['obj'] = 0,
['position'] = {
['xOfs'] = -75,
['yOfs'] = 150,
['relativePoint'] = "CENTER",
['point'] = "CENTER",
['relativeTo'] = "UIParent"
}
}
end
if SC.OTHER['SOTD'] == nil or SC.OTHER['SOTD']['position']== nil then
SC.OTHER['SOTD'] = {
['obj'] = 0,
['iconTxt'] = 0,
['overlay'] = false,
['position'] = {
['xOfs'] = 25,
['yOfs'] = 150,
['relativePoint'] = "CENTER",
['point'] = "CENTER",
['relativeTo'] = "UIParent"
}
}
end
if SC.OTHER['AS'] == nil then
SC.OTHER['AS'] = {
['obj'] = 0,
911,6 → 973,9
if SC.BARS['VANCD'] == nil then--Vanish
SC.BARS['VANCD'] = {['color'] = {.42, .46, .51}}
end
if SC.BARS['FOTD'] == nil then--Fury of the Destroyer
SC.BARS['FOTD'] = {['color'] = {.7, .13, .75}}
end
if SC.BARS['SS'] == nil then--Shadowstep
SC.BARS['SS'] = {['color'] = {.76, .28, .78}}
end
1210,7 → 1275,7
SC.BARS[k]['id'] = SC_SPELLID[k]
end
 
local buff = {'AR', 'SUB', 'EP', 'CV', 'AC', 'FE', 'SND', 'SD', 'SOD', 'SB', 'OP', 'ENV', 'GB', 'GSWW', 'MAI', 'LD', 'BF', 'SHT', 'COS', 'EVA', 'SPR', 'BLS', 'MA', 'SS'}
local buff = {'FOTD', 'AR', 'SUB', 'EP', 'CV', 'AC', 'FE', 'SND', 'SD', 'SOD', 'SB', 'OP', 'ENV', 'GB', 'GSWW', 'MAI', 'LD', 'BF', 'SHT', 'COS', 'EVA', 'SPR', 'BLS', 'MA', 'SS'}
for i, v in ipairs(buff) do--BUFF
SC.BARS[v]['type'] = 1
end