WoWInterface SVN SliceCommander

Compare Revisions

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

Rev 243 → Rev 244

Config.lua
152,6 → 152,17
SC.BARS['EVACD']['obj'].icon:SetTexture("Interface\\Icons\\spell_shadow_shadowward")
SC.BARS['SPRCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_rogue_sprint")
SC.BARS['SSCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_rogue_shadowstep")
SC.BARS['FECD']['obj'].icon:SetTexture("Interface\\Icons\\ability_rogue_feint")
 
--COVENANTS
SC.BARS['SUMSCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_kyrian_summonsteward")
SC.BARS['FCCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_necrolord_fleshcraft")
SC.BARS['SOSCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_nightfae_flicker")
SC.BARS['DOSCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_venthyr_doorofshadows")
SC.BARS['ERCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_bastion_rogue")
SC.BARS['SBSCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_maldraxxus_rogue")
SC.BARS['SPCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_ardenweald_rogue")
SC.BARS['FLACD']['obj'].icon:SetTexture("Interface\\Icons\\ability_revendreth_rogue")
 
 
--ASSASSINATION
558,11 → 569,11
end
 
function SliceCommander:Global()
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'})
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', 'SPCD', 'FLACD', 'SP', 'FLA'})
SliceCommander:NotDisplaySpells({'HEALTH', 'THEALTH', 'VANCD', 'KICD', 'COS', 'COSCD', 'EVA', 'EVACD', 'SPR', 'SPRCD', 'SS'})
 
SliceCommander:FlashSpells({'SND'})
SliceCommander:NotFlashSpells({'KSCD', 'CVCD', 'TOTCD', 'SSCD', 'CDCD', 'MDCD', 'DFACD', 'FECD', 'ESSECD', 'VANCD', 'KICD', 'COSCD', 'EVACD', 'SPRCD'})
SliceCommander:NotFlashSpells({'KSCD', 'CVCD', 'TOTCD', 'SSCD', 'CDCD', 'MDCD', 'DFACD', 'FECD', 'ESSECD', 'VANCD', 'KICD', 'COSCD', 'EVACD', 'SPRCD', 'SUMSCD', 'FCCD', 'SOSCD', 'DOSCD', 'ERCD', 'SBSCD', 'SPCD', 'FLACD', 'SP', 'FLA'})
 
_G['SC'].orderBar = _G['SC'].maxPos
_G['SC'].orderCDBar = _G['SC'].maxCDPos
571,8 → 582,8
SC.SET.Pos.CP = -1
end
 
SliceCommander:OrderSpells({'SND', 'FOTD', 'CV', 'FE', 'SUB', 'AC', 'MAI', 'COS', 'EVA', 'SPR', 'SS'})
SliceCommander:OrderCDs({'CVCD', 'TOTCD', 'VANCD', 'SSCD', 'CDCD', 'MDCD', 'DFACD', 'THREAT', 'HEALTH', 'THEALTH', 'CS', 'KS', 'KSCD', 'KICD', 'COSCD', 'EVACD', 'SPRCD', 'FECD', 'ESSECD'})
SliceCommander:OrderSpells({'SND', 'FOTD', 'CV', 'FE', 'SUB', 'AC', 'MAI', 'COS', 'EVA', 'SPR', 'SS', 'SP', 'FLA'})
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
 
function SliceCommander:Assassination()
1024,8 → 1035,45
if SC.BARS['ESSECD'] == nil then--Essence CD
SC.BARS['ESSECD'] = {['color'] = {.01, .59, .78}}
end
 
SliceCommander:InitCovenantBarArray()
end
 
function SliceCommander:InitCovenantBarArray()
if SC.BARS['SUMSCD'] == nil then--Summon Steward (Kyrian)
SC.BARS['SUMSCD'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['FCCD'] == nil then--Fleshcraft (Necrolord)
SC.BARS['FCCD'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['SOSCD'] == nil then--Soulshape (Night Fae)
SC.BARS['SOSCD'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['DOSCD'] == nil then--Door of Shadows (Venthyr)
SC.BARS['DOSCD'] = {['color'] = {.2, .45, .82}}
end
 
 
if SC.BARS['ERCD'] == nil then--Echoing Reprimand (Kyrian)
SC.BARS['ERCD'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['SBSCD'] == nil then--Serrated Bone Spike (Necrolord)
SC.BARS['SBSCD'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['SP'] == nil then--Sepsis (Night Fae)
SC.BARS['SP'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['SPCD'] == nil then--Sepsis (Night Fae)
SC.BARS['SPCD'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['FLA'] == nil then--Flagellation (Venthyr)
SC.BARS['FLA'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['FLACD'] == nil then--Flagellation (Venthyr)
SC.BARS['FLACD'] = {['color'] = {.2, .45, .82}}
end
end
 
function SliceCommander:InitAssassinationBarArray()
if SC.BARS['GAR'] == nil then--Garrote
SC.BARS['GAR'] = {['color'] = {.83, .27, .27}}
1234,7 → 1282,7
SC.BARS[v]['type'] = 1
end
 
local debuff = {'GAR', 'RUP', 'DP', 'KS', 'CS', 'NB', 'VEN', 'GS', 'KB', 'BA', 'ST', 'TXB', 'CT', 'BE', 'GG', 'FW'}
local debuff = {'GAR', 'RUP', 'DP', 'KS', 'CS', 'NB', 'VEN', 'GS', 'KB', 'BA', 'ST', 'TXB', 'CT', 'BE', 'GG', 'FW', 'SP', 'FLA'}
for i, v in ipairs(debuff) do
SC.BARS[v]['type'] = 2
end
1244,13 → 1292,14
SC.BARS[v]['type'] = 3
end
 
local cd = {'VANCD', 'KSPCD', 'ARCD', 'CDBCD', 'CVCD', 'MDCD', 'GHCD', 'BECD', 'TOTCD', 'SDCD', 'SBCD', 'VENCD', 'GBCD', 'EXCD', 'GARCD', 'KBCD', 'KSCD', 'DFACD', 'KICD', 'TXBCD', 'SODCD', 'SHTCD', 'STHCD', 'COSCD', 'EVACD', 'SPRCD', 'FECD', 'GSCD', 'BRCD', 'GGCD', 'ESSECD', 'BFCD', 'RBCD'}
local cd = {'VANCD', 'KSPCD', 'ARCD', 'CDBCD', 'CVCD', 'MDCD', 'GHCD', 'BECD', 'TOTCD', 'SDCD', 'SBCD', 'VENCD', 'GBCD', 'EXCD', 'GARCD', 'KBCD', 'KSCD', 'DFACD', 'KICD', 'TXBCD', 'SODCD', 'SHTCD', 'STHCD', 'COSCD', 'EVACD', 'SPRCD', 'FECD', 'GSCD', 'BRCD', 'GGCD', 'ESSECD', 'BFCD', 'RBCD', 'SUMSCD', 'FCCD', 'SOSCD', 'DOSCD', 'ERCD', 'SPCD', 'FLACD'}
for i, v in ipairs(cd) do
SC.BARS[v]['type'] = 4
end
 
SC.BARS['SDCD']['type'] = 5
SC.BARS['SSCD']['type'] = 5
SC.BARS['SBSCD']['type'] = 5
SC.BARS['RB']['type'] = 6
--[[local chargecd = {'SDCD'}
for i, v in ipairs(chargecd) do
Settings.lua
14,6 → 14,8
local returnArray = {}
local selected = {}
local cd
 
local count = 0
for k, v in pairs(SC.SET.Pos) do
if _G['SC'].BARS[string.upper(k)] == nil or _G['SC'].BARS[string.upper(k)]['name'] == nil then
_G['SC'].SET.Pos[string.upper(k)] = nil--Remove spell
30,9 → 32,14
else
selected[v] = selected[v] .. ', ' .. _G['SC'].BARS[string.upper(k)]['name'] .. cd
end
count = count+1
end
end
for key = -30, 30, 1 do
 
_G['SC'].countBars = count
 
 
for key = -1*count, count, 1 do
if key ~= 0 then
if not selected[key] then
returnArray[key] = key .. '. ' .. L['**Empty**']
165,15 → 172,15
 
function SliceCommander:getSpellSettings(spell)
local args = {
header = {
['header'..spell] = {
type = "header",
order = SliceCommander:getOrder(),
name = L['Spell'],
name = string.format(L["%s spell"], SC_SPELL[spell]),
},
Show = SliceCommander:getShowSetting(spell),
Color = SliceCommander:getColorSetting(spell),
Pos = SliceCommander:getPosSetting(spell),
Flash = SliceCommander:getFlashSetting(spell)
['Show'..spell] = SliceCommander:getShowSetting(spell),
['Color'..spell] = SliceCommander:getColorSetting(spell),
['Pos'..spell] = SliceCommander:getPosSetting(spell),
['Flash'..spell] = SliceCommander:getFlashSetting(spell)
}
if SC.SET.SpellSound ~= nil and SC.SET.SpellSound then
args.SpellSound = SliceCommander:getSpellSound(spell)
188,21 → 195,21
 
function SliceCommander:getCDSettings(spell)
local args = {
headerCD = {
['headerCD'..spell] = {
type = "header",
order = SliceCommander:getOrder(),
name = L['Cooldown'],
name = string.format(L["%s CD"], SC_SPELL[spell]),
},
Show = SliceCommander:getShowSetting(spell),
Color = SliceCommander:getColorSetting(spell),
Pos = SliceCommander:getPosSetting(spell),
CDFlash = SliceCommander:getFlashSetting(spell)
['Show'..spell] = SliceCommander:getShowSetting(spell),
['Color'..spell] = SliceCommander:getColorSetting(spell),
['Pos'..spell] = SliceCommander:getPosSetting(spell),
['CDFlash'..spell] = SliceCommander:getFlashSetting(spell)
}
if SC.SET.SpellSound ~= nil and SC.SET.SpellSound then
args.CDSpellSound = SliceCommander:getCDSpellSound(spell)
end
return {
name = SC_SPELL[spell] .. ' CD',
name = SC_SPELL[spell],
type = "group",
order = SliceCommander:getOrder(),
args = args
223,24 → 230,24
 
function SliceCommander:getSpellCDSettings(spell)
local args = {
header = {
['header'..spell] = {
type = "header",
order = SliceCommander:getOrder(),
name = L['Spell'],
name = string.format(L["%s spell"], SC_SPELL[spell]),
},
Show = SliceCommander:getShowSetting(spell),
Color = SliceCommander:getColorSetting(spell),
Pos = SliceCommander:getPosSetting(spell),
Flash = SliceCommander:getFlashSetting(spell),
headerCD = {
['Show'..spell] = SliceCommander:getShowSetting(spell),
['Color'..spell] = SliceCommander:getColorSetting(spell),
['Pos'..spell] = SliceCommander:getPosSetting(spell),
['Flash'..spell] = SliceCommander:getFlashSetting(spell),
['headerCD'..spell] = {
type = "header",
order = SliceCommander:getOrder(),
name = L['Cooldown'],
name = string.format(L["%s CD"], SC_SPELL[spell]),
},
CDShow = SliceCommander:getShowSetting(spell..'CD'),
CDColor = SliceCommander:getColorSetting(spell..'CD'),
CDPos = SliceCommander:getPosSetting(spell..'CD'),
CDFlash = SliceCommander:getFlashSetting(spell..'CD')
['CDShow'..spell] = SliceCommander:getShowSetting(spell..'CD'),
['CDColor'..spell] = SliceCommander:getColorSetting(spell..'CD'),
['CDPos'..spell] = SliceCommander:getPosSetting(spell..'CD'),
['CDFlash'..spell] = SliceCommander:getFlashSetting(spell..'CD')
}
if SC.SET.SpellSound ~= nil and SC.SET.SpellSound then
args.SpellSound = SliceCommander:getSpellSound(spell)
337,11 → 344,14
}
end
 
function SliceCommander:getShortcutSetting(sc_categ, sub_categ, spell)
function SliceCommander:getShortcutSetting(sc_categ, sub_categ, spell, label)
if label == nill then
label = SC_SPELL[spell]
end
return {
order = SliceCommander:getOrder(),
type = "execute",
name = SC_SPELL[spell],
name = label,
func = function() AceConfigDialog:SelectGroup(sc_categ, sub_categ, spell) end,
}
end
776,8 → 786,8
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_CD = SliceCommander:getShortcutSetting("SliceCommander_General", "Talents", "CDCD"),
Shortcut_MD = SliceCommander:getShortcutSetting("SliceCommander_General", "Talents", "MDCD"),
CD = SliceCommander:getCDSettings('CDCD'),
MD = SliceCommander:getCDSettings('MDCD'),
CDCD = SliceCommander:getCDSettings('CDCD'),
MDCD = SliceCommander:getCDSettings('MDCD'),
}
},
TalentsPVP = {
788,8 → 798,57
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_DFA = SliceCommander:getShortcutSetting("SliceCommander_General", "TalentsPVP", "DFACD"),
DFA = SliceCommander:getCDSettings('DFACD')
DFACD = SliceCommander:getCDSettings('DFACD')
}
},
Covenants = {
order = SliceCommander:getOrder(),
name = L["Covenants"],
type = "group",
childGroups = "tree",
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_Kyrian = SliceCommander:getShortcutSetting("SliceCommander_General", "Covenants", "Kyrian", L['Kyrian']),
Shortcut_Necrolord = SliceCommander:getShortcutSetting("SliceCommander_General", "Covenants", "Necrolord", L['Necrolord']),
Shortcut_NightFae = SliceCommander:getShortcutSetting("SliceCommander_General", "Covenants", "NightFae", L['Night Fae']),
Shortcut_Venthyr = SliceCommander:getShortcutSetting("SliceCommander_General", "Covenants", "Venthyr", L['Venthyr']),
Kyrian = {
name = L['Kyrian'],
type = "group",
order = SliceCommander:getOrder(),
args = SliceCommander_TableMerge(
SliceCommander:getCDSettings('ERCD').args,
SliceCommander:getCDSettings('SBSCD').args
)
},
Necrolord = {
name = L['Necrolord'],
type = "group",
order = SliceCommander:getOrder(),
args = SliceCommander_TableMerge(
SliceCommander:getCDSettings('FCCD').args,
SliceCommander:getCDSettings('SUMSCD').args
)
},
NightFae = {
name = L['Night Fae'],
type = "group",
order = SliceCommander:getOrder(),
args = SliceCommander_TableMerge(
SliceCommander:getSpellCDSettings('SP').args,
SliceCommander:getCDSettings('SOSCD').args
)
},
Venthyr = {
name = L['Venthyr'],
type = "group",
order = SliceCommander:getOrder(),
args = SliceCommander_TableMerge(
SliceCommander:getSpellCDSettings('FLA').args,
SliceCommander:getCDSettings('DOSCD').args
)
}
}
}
}
}
1242,11 → 1301,13
Shortcut_NB = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Skills", "NB"),
Shortcut_SOD = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Skills", "SOD"),
Shortcut_SS = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Skills", "SS"),
Shortcut_FW = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Skills", "FW"),
SD = SliceCommander:getSpellCDSettings('SD'),
SB = SliceCommander:getSpellCDSettings('SB'),
NB = SliceCommander:getSpellSettings('NB'),
SOD = SliceCommander:getSpellCDSettings('SOD'),
SS = SliceCommander:getSpellCDSettings('SS'),
FW = SliceCommander:getSpellSettings('FW'),
}
},
Talents = {
1260,12 → 1321,10
Shortcut_SUB = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "SUB"),
Shortcut_SHT = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "SHT"),
Shortcut_STHCD = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "STHCD"),
Shortcut_FW = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "FW"),
AC = SliceCommander:getSpellSettings('AC'),
SUB = SliceCommander:getSpellSettings('SUB'),
SHT = SliceCommander:getSpellCDSettings('SHT'),
STHCD = SliceCommander:getCDSettings('STHCD'),
FW = SliceCommander:getSpellSettings('FW'),
}
}
}