WoWInterface SVN SliceCommander

Compare Revisions

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

Rev 244 → Rev 246

Config.lua
170,7 → 170,6
SC.BARS['EXCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_deathwing_bloodcorruption_earth")
SC.BARS['GARCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_rogue_garrote")
SC.BARS['KBCD']['obj'].icon:SetTexture("Interface\\Icons\\inv_knife_1h_artifactgarona_d_01")
SC.BARS['TXBCD']['obj'].icon:SetTexture("Interface\\Icons\\inv_weapon_shortblade_62")
 
--OUTLAW
SC.BARS['ARCD']['obj'].icon:SetTexture("Interface\\Icons\\Spell_Shadow_ShadowWordDominate")
507,6 → 506,15
_G['SC'].SET.Pos['STH'] = nil
_G['SC'].BARS['STH'] = nil
end
if _G['SC'].version < '9.06' then
_G['SC'].SET.Pos['TXBCD'] = nil
_G['SC'].BARS['TXBCD'] = nil
_G['SC'].SET.Pos['TXB'] = nil
_G['SC'].BARS['TXB'] = nil
_G['SC'].SET.Pos['NB'] = nil
_G['SC'].BARS['NB'] = nil
end
 
_G['SC'].version = GetAddOnMetadata("SliceCommander", "Version")
end
end
569,7 → 577,7
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', 'SUMSCD', 'FCCD', 'SOSCD', 'DOSCD', 'ERCD', 'SBSCD', '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'})
582,22 → 590,22
SC.SET.Pos.CP = -1
end
 
SliceCommander:OrderSpells({'SND', 'FOTD', 'CV', 'FE', 'SUB', 'AC', 'MAI', 'COS', 'EVA', 'SPR', 'SS', 'SP', 'FLA'})
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
 
function SliceCommander:Assassination()
SliceCommander:DisplaySpells({'RUP', 'GAR', 'GARCD', 'VEN', 'VENCD', 'ENV', 'EP', 'DPBUT', 'EXCD', 'KB', 'KBCD', 'BA', 'ST', 'TXB', 'TXBCD', 'BLS', 'MA', 'CT'})
SliceCommander:DisplaySpells({'RUP', 'GAR', 'GARCD', 'VEN', 'VENCD', 'ENV', 'EP', 'DPBUT', 'EXCD', 'KB', 'KBCD', 'BA', 'ST', 'BLS', 'MA', 'CT'})
SliceCommander:NotDisplaySpells({'DP'})
 
SliceCommander:FlashSpells({'VENCD', 'EXCD'})
SliceCommander:NotFlashSpells({'GARCD', 'EXCD', 'KBCD', 'TXBCD'})
SliceCommander:NotFlashSpells({'GARCD', 'EXCD', 'KBCD'})
 
_G['SC'].orderBar = 0
_G['SC'].orderCDBar = -1
 
SliceCommander:OrderSpells({'GAR', 'RUP', 'ENV', 'KB', 'BA', 'ST', 'VEN', 'DP', 'EP', 'TXB', 'BLS', 'MA', 'CT'})
SliceCommander:OrderCDs({'VENCD', 'KBCD', 'EXCD', 'GARCD', 'TXBCD'})
SliceCommander:OrderSpells({'GAR', 'RUP', 'ENV', 'KB', 'BA', 'ST', 'VEN', 'DP', 'EP', 'BLS', 'MA', 'CT'})
SliceCommander:OrderCDs({'VENCD', 'KBCD', 'EXCD', 'GARCD'})
end
 
function SliceCommander:Outlaw()
615,7 → 623,7
end
 
function SliceCommander:Subtlety()
SliceCommander:DisplaySpells({'SD', 'SDCD', 'SB', 'SBCD', 'NB', 'SOD', 'GB', 'GBCD', 'SODCD', 'SHT', 'SHTCD', 'STHCD'})
SliceCommander:DisplaySpells({'SD', 'SDCD', 'SB', 'SBCD', 'SOD', 'GB', 'GBCD', 'SODCD', 'SHT', 'SHTCD', 'STHCD'})
SliceCommander:NotDisplaySpells({'FW'})
 
SliceCommander:FlashSpells({'SDCD', 'SBCD', 'SODCD'})
624,7 → 632,7
_G['SC'].orderBar = 0
_G['SC'].orderCDBar = -1
 
SliceCommander:OrderSpells({'GB', 'NB', 'SOD', 'SD', 'SB', 'SHT', 'FW'})
SliceCommander:OrderSpells({'GB', 'SOD', 'SD', 'SB', 'SHT', 'FW'})
SliceCommander:OrderCDs({'GBCD', 'SDCD', 'SBCD', 'SODCD', 'SHTCD', 'STHCD'})
 
end
1060,6 → 1068,9
if SC.BARS['SBSCD'] == nil then--Serrated Bone Spike (Necrolord)
SC.BARS['SBSCD'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['SBS'] == nil then--Serrated Bone Spike (Necrolord)
SC.BARS['SBS'] = {['color'] = {.2, .45, .82}}
end
if SC.BARS['SP'] == nil then--Sepsis (Night Fae)
SC.BARS['SP'] = {['color'] = {.2, .45, .82}}
end
1101,12 → 1112,6
if SC.BARS['DP'] == nil then--Deadly Poison
SC.BARS['DP'] = {['color'] = {.27, .68, .23}}
end
if SC.BARS['TXB'] == nil then--Toxic Blade
SC.BARS['TXB'] = {['color'] = {.27, .68, .23}}
end
if SC.BARS['TXBCD'] == nil then--Toxic Blade CD
SC.BARS['TXBCD'] = {['color'] = {.27, .68, .23}}
end
if SC.BARS['ENV'] == nil then--Envenom
SC.BARS['ENV'] = {['color'] = {.27, .68, .23}}
end
1216,13 → 1221,6
if SC.BARS['GBCD'] == nil then--Goremaw's Bite CD
SC.BARS['GBCD'] = {['color'] = {.52, .18, .54}}
end
if SC.BARS['NB'] == nil then--Nightblade
SC.BARS['NB'] = {['color'] = {.52, .18, .54}}
end
SC.BARS['NB']['tick'] = {
['obj'] = {},
['value'] = 2
}
if SC.BARS['SOD'] == nil then--Symbols of Death
SC.BARS['SOD'] = {['color'] = {.25, .26, .58}}
end
1278,29 → 1276,33
end
 
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
for i, v in ipairs(buff) do--BUFF
SC.BARS[v]['type'] = 1
end
 
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
local debuff = {'GAR', 'RUP', 'DP', 'KS', 'CS', 'VEN', 'GS', 'KB', 'BA', 'ST', 'CT', 'BE', 'GG', 'FW', 'SP', 'FLA', 'SBS'}
for i, v in ipairs(debuff) do--DEBUFF
SC.BARS[v]['type'] = 2
end
 
local selfdebuff = {'CDCD', 'CDB'}
for i, v in ipairs(selfdebuff) do
for i, v in ipairs(selfdebuff) do--SELF DEBUF
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', 'SUMSCD', 'FCCD', 'SOSCD', 'DOSCD', 'ERCD', 'SPCD', 'FLACD'}
for i, v in ipairs(cd) do
local cd = {'VANCD', 'KSPCD', 'ARCD', 'CDBCD', 'CVCD', 'MDCD', 'GHCD', 'BECD', 'TOTCD', 'SDCD', 'SBCD', 'VENCD', 'GBCD', 'EXCD', 'GARCD', 'KBCD', 'KSCD', 'DFACD', 'KICD', '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--CD
SC.BARS[v]['type'] = 4
end
 
--CHARGE CD
SC.BARS['SDCD']['type'] = 5
SC.BARS['SSCD']['type'] = 5
SC.BARS['SBSCD']['type'] = 5
 
--MULTIPLE BUFF BAR
SC.BARS['RB']['type'] = 6
 
--[[local chargecd = {'SDCD'}
for i, v in ipairs(chargecd) do
SC.BARS[v]['type'] = 5
1331,15 → 1333,6
[5] = 24,
[6] = 28
},
['NB'] = {
[0] = 0,
[1] = 8,
[2] = 10,
[3] = 12,
[4] = 14,
[5] = 16,
[6] = 18
},
['ENV'] = {
[0] = 0,
[1] = 2,
Settings.lua
786,8 → 786,10
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_CD = SliceCommander:getShortcutSetting("SliceCommander_General", "Talents", "CDCD"),
Shortcut_MD = SliceCommander:getShortcutSetting("SliceCommander_General", "Talents", "MDCD"),
Shortcut_AC = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "AC"),
CDCD = SliceCommander:getCDSettings('CDCD'),
MDCD = SliceCommander:getCDSettings('MDCD'),
AC = SliceCommander:getSpellSettings('AC'),
}
},
TalentsPVP = {
818,7 → 820,7
order = SliceCommander:getOrder(),
args = SliceCommander_TableMerge(
SliceCommander:getCDSettings('ERCD').args,
SliceCommander:getCDSettings('SBSCD').args
SliceCommander:getCDSettings('SUMSCD').args
)
},
Necrolord = {
826,8 → 828,8
type = "group",
order = SliceCommander:getOrder(),
args = SliceCommander_TableMerge(
SliceCommander:getCDSettings('FCCD').args,
SliceCommander:getCDSettings('SUMSCD').args
SliceCommander:getSpellCDSettings('SBS').args,
SliceCommander:getCDSettings('FCCD').args
)
},
NightFae = {
959,14 → 961,12
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_EXCD = SliceCommander:getShortcutSetting("SliceCommander_Assassination", "Talents", "EXCD"),
Shortcut_TXB = SliceCommander:getShortcutSetting("SliceCommander_Assassination", "Talents", "TXB"),
Shortcut_EP = SliceCommander:getShortcutSetting("SliceCommander_Assassination", "Talents", "EP"),
Shortcut_SUB = SliceCommander:getShortcutSetting("SliceCommander_Assassination", "Talents", "SUB"),
Shortcut_BLS = SliceCommander:getShortcutSetting("SliceCommander_Assassination", "Talents", "BLS"),
Shortcut_MA = SliceCommander:getShortcutSetting("SliceCommander_Assassination", "Talents", "MA"),
Shortcut_CT = SliceCommander:getShortcutSetting("SliceCommander_Assassination", "Talents", "CT"),
EXCD = SliceCommander:getCDSettings('EXCD'),
TXB = SliceCommander:getSpellCDSettings('TXB'),
EP = SliceCommander:getSpellSettings('EP'),
SUB = SliceCommander:getSpellSettings('SUB'),
BLS = SliceCommander:getSpellSettings('BLS'),
1192,13 → 1192,11
childGroups = "tree",
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_AC = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Talents", "AC"),
Shortcut_GS = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Talents", "GS"),
Shortcut_KSPCD = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Talents", "KSPCD"),
Shortcut_LD = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Talents", "LD"),
Shortcut_BRCD = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Talents", "BRCD"),
Shortcut_CDB = SliceCommander:getShortcutSetting("SliceCommander_Outlaw", "Talents", "CDB"),
AC = SliceCommander:getSpellSettings('AC'),
GS = SliceCommander:getSpellCDSettings('GS'),
KSPCD = SliceCommander:getCDSettings('KSPCD'),
LD = SliceCommander:getSpellSettings('LD'),
1296,15 → 1294,15
childGroups = "tree",
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_RUP = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Skills", "RUP"),
Shortcut_SD = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Skills", "SD"),
Shortcut_SB = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Skills", "SB"),
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"),
RUP = SliceCommander:getSpellSettings('RUP'),
SD = SliceCommander:getSpellCDSettings('SD'),
SB = SliceCommander:getSpellCDSettings('SB'),
NB = SliceCommander:getSpellSettings('NB'),
SOD = SliceCommander:getSpellCDSettings('SOD'),
SS = SliceCommander:getSpellCDSettings('SS'),
FW = SliceCommander:getSpellSettings('FW'),
1317,11 → 1315,9
childGroups = "tree",
args = {
Shortcut = SliceCommander:getShortcutHeader(),
Shortcut_AC = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "AC"),
Shortcut_SUB = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "SUB"),
Shortcut_SHT = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "SHT"),
Shortcut_STHCD = SliceCommander:getShortcutSetting("SliceCommander_Sublety", "Talents", "STHCD"),
AC = SliceCommander:getSpellSettings('AC'),
SUB = SliceCommander:getSpellSettings('SUB'),
SHT = SliceCommander:getSpellCDSettings('SHT'),
STHCD = SliceCommander:getCDSettings('STHCD'),
Event.lua
82,6 → 82,10
end
end
 
function SliceCommander:UNKNOWN()
--DO NOTHING TRY TO AVOID UBKOWN CALL...
end
 
function SliceCommander:ACTIVE_TALENT_GROUP_CHANGED()
if SC.initDone then
SliceCommander:SetSparks()--MOVE SPARK for the current spec