WoWInterface SVN SliceCommander

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 224 to Rev 225
    ↔ Reverse comparison
  •

Rev 224 → Rev 225

trunk/SliceCommander.lua
215,7 → 215,7
 
function SliceCommander:UpdateBar(spell)
local BAR = SC.BARS[spell]
local expire, icon, count, duration, unitCaster, x, _, maxValue, widthSeconde
local expire, icon, count, duration, unitCaster, x, _, maxValue, widthSeconde, value1, value2, value3
 
if SC.SET.display[spell] ~= true then
BAR['expire'] = 0
225,9 → 225,10
return
end
 
value1, value2, value3 = 0 , 0, 0
local last = BAR['expire']
if BAR['type'] == 1 then
_, _, icon, count, _, duration, BAR['expire'], unitCaster = UnitAura("player", BAR['name'], nil, "PLAYER")
_, _, icon, count, _, duration, BAR['expire'], unitCaster, _, _, _, _, _, _, _, _, value1, value2, value3 = UnitAura("player", BAR['name'], nil, "PLAYER")
elseif BAR['type'] == 2 then
_, _, icon, count, _, duration, BAR['expire'], unitCaster = UnitDebuff("target", BAR['name'], nil, "PLAYER")
elseif BAR['type'] == 3 then
258,6 → 259,10
if count and count > 1 then
textcount = ' x'..count
end
if value1 == 162 and value2 == 0 and value3 == 19 then
textcount = textcount..' - '..L['Empowered']
count = value1..value2..value3
end
if not BAR['count'] or BAR['count'] ~= count then
if SC.SET.SpellText == true then
BAR['obj'].text2:SetText(string.format("%s", BAR['name']..textcount))
608,7 → 613,7
if value <= 0 then
BAR['obj'].text:SetTextColor(0, 1, 0)
else
BAR['obj'].text:SetTextColor(1, 1, 1)
BAR['obj'].text:SetTextColor(.835, .784, .722)
end
end
end
trunk/Core/Settings.lua
593,6 → 593,7
args = {
displayDescription = SliceCommander:getDisplayDescriptionSetting(),
CDB = SliceCommander:getSpellCDSettings('CDB'),
LD = SliceCommander:getSpellSettings('LD'),
SND = SliceCommander:getSpellSettings('SND'),
GS = SliceCommander:getSpellSettings('GS'),
RB = {
trunk/Core/Config.lua
541,14 → 541,14
end
 
function SliceCommander:Outlaw()
SliceCommander:DisplaySpells({'SND', 'RB', 'AR', 'ARCD', 'CDB', 'CDBCD', 'KSP', 'GS', 'GH', 'CB', 'BE', 'BF', 'OP', 'GSWW', 'BB'})
SliceCommander:DisplaySpells({'SND', 'RB', 'AR', 'ARCD', 'CDB', 'CDBCD', 'KSP', 'GS', 'GH', 'CB', 'BE', 'BF', 'OP', 'GSWW', 'BB', 'LD'})
SliceCommander:NotDisplaySpells({'PA'})
 
_G['SC'].orderBar = 0
_G['SC'].orderCDBar = -1
 
SliceCommander:OrderSpells({'SND', 'RB', 'AR', 'GS', 'OP', 'CDB', 'GSWW'})
SliceCommander:OrderCDs({'BE', 'ARCD', 'KSP', 'CB', 'GH', 'PA', 'CDBCD'})
SliceCommander:OrderCDs({'BE', 'ARCD', 'KSP', 'CB', 'GH', 'PA', 'CDBCD', 'LD'})
end
 
function SliceCommander:Subtlety()
1026,6 → 1026,9
if SC.BARS['KSP'] == nil then--Killing Spree
SC.BARS['KSP'] = {['color'] = {.27, .68, .23}}
end
if SC.BARS['LD'] == nil then--Loaded Dice
SC.BARS['LD'] = {['color'] = {.63, .52, .38}}
end
end
 
function SliceCommander:InitSubtletyBarArray()--http://paletton.com/#uid=64r0u0kleqtbzEKgVuIpcmGtdhZ
1079,7 → 1082,7
SC.BARS[k]['name'] = SC_SPELL[k]
end
 
local buff = {'FOTD', 'AR', 'SUB', 'EP', 'CV', 'AC', 'FE', 'SND', 'SD', 'SOD', 'SB', 'OP', 'ENV', 'GB', 'GSWW', 'MAI'}
local buff = {'FOTD', 'AR', 'SUB', 'EP', 'CV', 'AC', 'FE', 'SND', 'SD', 'SOD', 'SB', 'OP', 'ENV', 'GB', 'GSWW', 'MAI', 'LD'}
for i, v in ipairs(buff) do
SC.BARS[v]['type'] = 1
end
trunk/SliceCommander.toc
1,6 → 1,6
## Interface: 70200
## Author: Tomate
## Version: 7.18
## Version: 7.19
## Title: |cffc14f2cSlice|r|cff40a740Commander|r
## Notes: Energy bar, Combo point bar and rogue timer bar.
## SavedVariables: SC
trunk/Locale/enUS.lua
175,4 → 175,5
L["A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."] = true
L["Warning settings"] = true
L["Enable kick warning"] = true
L["Font"] = true
\ No newline at end of file +L["Font"] = true +L['Empowered'] = true \ No newline at end of file
trunk/Locale/ruRU.lua
175,4 → 175,5
L["A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."] = "A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."
L["Warning settings"] = "Warning settings"
L["Enable kick warning"] = "Enable kick warning"
L["Font"] = "Font"
\ No newline at end of file +L["Font"] = "Font" +L['Empowered'] = "Empowered" \ No newline at end of file
trunk/Locale/esES.lua
175,4 → 175,5
L["A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."] = true
L["Warning settings"] = true
L["Enable kick warning"] = true
L["Font"] = true
\ No newline at end of file +L["Font"] = true +L['Empowered'] = true \ No newline at end of file
trunk/Locale/frFR.lua
175,4 → 175,5
L["A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."] = "Une fine barre blancher sera affichée sur chaque barre de DoT et de HoT pour mettre en avant le moment exact ou l'effet se produit."
L["Warning settings"] = "Option de l'alerte"
L["Enable kick warning"] = "Activer l'alerte d'anti-cast"
L["Font"] = "Police"
\ No newline at end of file +L["Font"] = "Police" +L['Empowered'] = "Empowered" \ No newline at end of file
trunk/Locale/spell.lua
47,6 → 47,7
SC_SPELL['PS'] = GetSpellInfo(185763)--Cannonball Barrage
SC_SPELL['BB'] = GetSpellInfo(202895)--Blunderbuss
SC_SPELL['RT'] = GetSpellInfo(208225)--Run Through
SC_SPELL['LD'] = GetSpellInfo(240837)--Loaded Dice
 
--ASSASSINAT
SC_SPELL['HEM'] = GetSpellInfo(16511) --Hemorrhage
trunk/Locale/deDE.lua
175,4 → 175,5
L["A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."] = "A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."
L["Warning settings"] = "Warning settings"
L["Enable kick warning"] = "Enable kick warning"
L["Font"] = "Font"
\ No newline at end of file +L["Font"] = "Font" +L['Empowered'] = "Empowered" \ No newline at end of file
trunk/Locale/zhCN.lua
175,4 → 175,5
L["A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."] = "A small white bar will be displaid on each HoT / DoT timer to show you when the effect really occur."
L["Warning settings"] = "Warning settings"
L["Enable kick warning"] = "Enable kick warning"
L["Font"] = "Font"
\ No newline at end of file +L["Font"] = "Font" +L['Empowered'] = "Empowered" \ No newline at end of file