WoWInterface SVN SliceCommander
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 227 to Rev 228
- ↔ Reverse comparison
Rev 227 → Rev 228
trunk/Libs/AceEvent-3.0/AceEvent-3.0.lua
9,8 → 9,10
| -- make into AceEvent. |
| -- @class file |
| -- @name AceEvent-3.0 |
| -- @release $Id: AceEvent-3.0.lua 975 2010-10-23 11:26:18Z nevcairiel $ |
| local MAJOR, MINOR = "AceEvent-3.0", 3 |
| -- @release $Id: AceEvent-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $ |
| local CallbackHandler = LibStub("CallbackHandler-1.0") |
| local MAJOR, MINOR = "AceEvent-3.0", 4 |
| local AceEvent = LibStub:NewLibrary(MAJOR, MINOR) |
| if not AceEvent then return end |
18,8 → 20,6
| -- Lua APIs |
| local pairs = pairs |
| local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0") |
| AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame |
| AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib |
trunk/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
1,7 → 1,7
| --[[----------------------------------------------------------------------------- |
| EditBox Widget |
| -------------------------------------------------------------------------------]] |
| local Type, Version = "EditBox", 26 |
| local Type, Version = "EditBox", 27 |
| local AceGUI = LibStub and LibStub("AceGUI-3.0", true) |
| if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end |
73,7 → 73,7
| local value = frame:GetText() |
| local cancel = self:Fire("OnEnterPressed", value) |
| if not cancel then |
| PlaySound("igMainMenuOptionCheckBoxOn") |
| PlaySound(PlaySoundKitID and "igMainMenuOptionCheckBoxOn" or 856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON |
| HideButton(self) |
| end |
| end |
trunk/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
21,7 → 21,7
| ]] |
| do |
| local Type = "Window" |
| local Version = 5 |
| local Version = 6 |
| local function frameOnShow(this) |
| this.obj:Fire("OnShow") |
32,7 → 32,7
| end |
| local function closeOnClick(this) |
| PlaySound("gsTitleOptionExit") |
| PlaySound(PlaySoundKitID and "gsTitleOptionExit" or 799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT |
| this.obj:Hide() |
| end |
trunk/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
2,7 → 2,7
| Button Widget |
| Graphical Button. |
| -------------------------------------------------------------------------------]] |
| local Type, Version = "Button", 23 |
| local Type, Version = "Button", 24 |
| local AceGUI = LibStub and LibStub("AceGUI-3.0", true) |
| if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end |
18,7 → 18,7
| -------------------------------------------------------------------------------]] |
| local function Button_OnClick(frame, ...) |
| AceGUI:ClearFocus() |
| PlaySound("igMainMenuOption") |
| PlaySound(PlaySoundKitID and "igMainMenuOption" or 852) -- SOUNDKIT.IG_MAINMENU_OPTION |
| frame.obj:Fire("OnClick", ...) |
| end |
trunk/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
1,4 → 1,4
| --[[ $Id: AceGUIWidget-DropDown-Items.lua 1153 2016-11-20 09:57:15Z nevcairiel $ ]]-- |
| --[[ $Id: AceGUIWidget-DropDown-Items.lua 1161 2017-08-12 14:30:16Z funkydude $ ]]-- |
| local AceGUI = LibStub("AceGUI-3.0") |
323,7 → 323,7
| -- Does not close the pullout on click. |
| do |
| local widgetType = "Dropdown-Item-Toggle" |
| local widgetVersion = 3 |
| local widgetVersion = 4 |
| local function UpdateToggle(self) |
| if self.value then |
343,9 → 343,9
| if self.disabled then return end |
| self.value = not self.value |
| if self.value then |
| PlaySound("igMainMenuOptionCheckBoxOn") |
| PlaySound(PlaySoundKitID and "igMainMenuOptionCheckBoxOn" or 856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON |
| else |
| PlaySound("igMainMenuOptionCheckBoxOff") |
| PlaySound(PlaySoundKitID and "igMainMenuOptionCheckBoxOff" or 857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF |
| end |
| UpdateToggle(self) |
| self:Fire("OnValueChanged", self.value) |
trunk/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
2,7 → 2,7
| Slider Widget |
| Graphical Slider, like, for Range values. |
| -------------------------------------------------------------------------------]] |
| local Type, Version = "Slider", 21 |
| local Type, Version = "Slider", 22 |
| local AceGUI = LibStub and LibStub("AceGUI-3.0", true) |
| if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end |
108,7 → 108,7
| end |
| if value then |
| PlaySound("igMainMenuOptionCheckBoxOn") |
| PlaySound(PlaySoundKitID and "igMainMenuOptionCheckBoxOn" or 856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON |
| self.slider:SetValue(value) |
| self:Fire("OnMouseUp", value) |
| end |
trunk/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
2,7 → 2,7
| TabGroup Container |
| Container that uses tabs on top to switch between groups. |
| -------------------------------------------------------------------------------]] |
| local Type, Version = "TabGroup", 35 |
| local Type, Version = "TabGroup", 36 |
| local AceGUI = LibStub and LibStub("AceGUI-3.0", true) |
| if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end |
63,7 → 63,7
| -------------------------------------------------------------------------------]] |
| local function Tab_OnClick(frame) |
| if not (frame.selected or frame.disabled) then |
| PlaySound("igCharacterInfoTab") |
| PlaySound(PlaySoundKitID and "igCharacterInfoTab" or 841) -- SOUNDKIT.IG_CHARACTER_INFO_TAB |
| frame.obj:SelectTab(frame.value) |
| end |
| end |
trunk/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
1,7 → 1,7
| --[[----------------------------------------------------------------------------- |
| Checkbox Widget |
| -------------------------------------------------------------------------------]] |
| local Type, Version = "CheckBox", 22 |
| local Type, Version = "CheckBox", 23 |
| local AceGUI = LibStub and LibStub("AceGUI-3.0", true) |
| if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end |
60,9 → 60,9
| self:ToggleChecked() |
| if self.checked then |
| PlaySound("igMainMenuOptionCheckBoxOn") |
| PlaySound(PlaySoundKitID and "igMainMenuOptionCheckBoxOn" or 856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON |
| else -- for both nil and false (tristate) |
| PlaySound("igMainMenuOptionCheckBoxOff") |
| PlaySound(PlaySoundKitID and "igMainMenuOptionCheckBoxOff" or 857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF |
| end |
| self:Fire("OnValueChanged", self.checked) |
trunk/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
1,7 → 1,7
| --[[----------------------------------------------------------------------------- |
| Frame Container |
| -------------------------------------------------------------------------------]] |
| local Type, Version = "Frame", 25 |
| local Type, Version = "Frame", 26 |
| local AceGUI = LibStub and LibStub("AceGUI-3.0", true) |
| if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end |
21,7 → 21,7
| Scripts |
| -------------------------------------------------------------------------------]] |
| local function Button_OnClick(frame) |
| PlaySound("gsTitleOptionExit") |
| PlaySound(PlaySoundKitID and "gsTitleOptionExit" or 799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT |
| frame.obj:Hide() |
| end |
trunk/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
1,4 → 1,4
| --[[ $Id: AceGUIWidget-DropDown.lua 1116 2014-10-12 08:15:46Z nevcairiel $ ]]-- |
| --[[ $Id: AceGUIWidget-DropDown.lua 1161 2017-08-12 14:30:16Z funkydude $ ]]-- |
| local AceGUI = LibStub("AceGUI-3.0") |
| -- Lua APIs |
356,7 → 356,7
| do |
| local widgetType = "Dropdown" |
| local widgetVersion = 30 |
| local widgetVersion = 31 |
| --[[ Static data ]]-- |
381,7 → 381,7
| local function Dropdown_TogglePullout(this) |
| local self = this.obj |
| PlaySound("igMainMenuOptionCheckBoxOn") -- missleading name, but the Blizzard code uses this sound |
| PlaySound(PlaySoundKitID and "igMainMenuOptionCheckBoxOn" or 856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON |
| if self.open then |
| self.open = nil |
| self.pullout:Close() |
trunk/Libs/AceConfig-3.0/AceConfig-3.0.lua
3,7 → 3,7
| -- as well as associate it with a slash command. |
| -- @class file |
| -- @name AceConfig-3.0 |
| -- @release $Id: AceConfig-3.0.lua 969 2010-10-07 02:11:48Z shefki $ |
| -- @release $Id: AceConfig-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $ |
| --[[ |
| AceConfig-3.0 |
12,13 → 12,14
| ]] |
| local MAJOR, MINOR = "AceConfig-3.0", 2 |
| local cfgreg = LibStub("AceConfigRegistry-3.0") |
| local cfgcmd = LibStub("AceConfigCmd-3.0") |
| local MAJOR, MINOR = "AceConfig-3.0", 3 |
| local AceConfig = LibStub:NewLibrary(MAJOR, MINOR) |
| if not AceConfig then return end |
| local cfgreg = LibStub("AceConfigRegistry-3.0") |
| local cfgcmd = LibStub("AceConfigCmd-3.0") |
| --TODO: local cfgdlg = LibStub("AceConfigDialog-3.0", true) |
| --TODO: local cfgdrp = LibStub("AceConfigDropdown-3.0", true) |
trunk/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
1,10 → 1,13
| --- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables. |
| -- @class file |
| -- @name AceConfigDialog-3.0 |
| -- @release $Id: AceConfigDialog-3.0.lua 1139 2016-07-03 07:43:51Z nevcairiel $ |
| -- @release $Id: AceConfigDialog-3.0.lua 1163 2017-08-14 14:04:39Z nevcairiel $ |
| local LibStub = LibStub |
| local MAJOR, MINOR = "AceConfigDialog-3.0", 61 |
| local gui = LibStub("AceGUI-3.0") |
| local reg = LibStub("AceConfigRegistry-3.0") |
| local MAJOR, MINOR = "AceConfigDialog-3.0", 64 |
| local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) |
| if not AceConfigDialog then return end |
17,9 → 20,6
| AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {} |
| AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {} |
| local gui = LibStub("AceGUI-3.0") |
| local reg = LibStub("AceConfigRegistry-3.0") |
| -- Lua APIs |
| local tconcat, tinsert, tsort, tremove, tsort = table.concat, table.insert, table.sort, table.remove, table.sort |
| local strmatch, format = string.match, string.format |
611,6 → 611,31
| end |
| end |
| local function validationErrorPopup(message) |
| if not StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] then |
| StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] = {} |
| end |
| local t = StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] |
| t.text = message |
| t.button1 = OKAY |
| t.preferredIndex = STATICPOPUP_NUMDIALOGS |
| local dialog, oldstrata |
| t.OnAccept = function() |
| if dialog and oldstrata then |
| dialog:SetFrameStrata(oldstrata) |
| end |
| end |
| t.timeout = 0 |
| t.whileDead = 1 |
| t.hideOnEscape = 1 |
| dialog = StaticPopup_Show("ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG") |
| if dialog then |
| oldstrata = dialog:GetFrameStrata() |
| dialog:SetFrameStrata("TOOLTIP") |
| end |
| end |
| local function ActivateControl(widget, event, ...) |
| --This function will call the set / execute handler for the widget |
| --widget:GetUserDataTable() contains the needed info |
696,32 → 721,26
| end |
| local rootframe = user.rootframe |
| if type(validated) == "string" then |
| --validate function returned a message to display |
| if rootframe.SetStatusText then |
| rootframe:SetStatusText(validated) |
| else |
| -- TODO: do something else. |
| end |
| PlaySound("igPlayerInviteDecline") |
| del(info) |
| return true |
| elseif not validated then |
| --validate returned false |
| if rootframe.SetStatusText then |
| if not validated or type(validated) == "string" then |
| if not validated then |
| if usage then |
| rootframe:SetStatusText(name..": "..usage) |
| validated = name..": "..usage |
| else |
| if pattern then |
| rootframe:SetStatusText(name..": Expected "..pattern) |
| validated = name..": Expected "..pattern |
| else |
| rootframe:SetStatusText(name..": Invalid Value") |
| validated = name..": Invalid Value" |
| end |
| end |
| end |
| -- show validate message |
| if rootframe.SetStatusText then |
| rootframe:SetStatusText(validated) |
| else |
| -- TODO: do something else |
| validationErrorPopup(validated) |
| end |
| PlaySound("igPlayerInviteDecline") |
| PlaySound(PlaySoundKitID and "igPlayerInviteDecline" or 882) -- SOUNDKIT.IG_PLAYER_INVITE_DECLINE || XXX _DECLINE is actually missing from the table |
| del(info) |
| return true |
| else |
trunk/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
1,7 → 1,7
| --- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames. |
| -- @class file |
| -- @name AceConfigCmd-3.0 |
| -- @release $Id: AceConfigCmd-3.0.lua 1045 2011-12-09 17:58:40Z nevcairiel $ |
| -- @release $Id: AceConfigCmd-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $ |
| --[[ |
| AceConfigCmd-3.0 |
14,8 → 14,9
| -- TODO: plugin args |
| local cfgreg = LibStub("AceConfigRegistry-3.0") |
| local MAJOR, MINOR = "AceConfigCmd-3.0", 13 |
| local MAJOR, MINOR = "AceConfigCmd-3.0", 14 |
| local AceConfigCmd = LibStub:NewLibrary(MAJOR, MINOR) |
| if not AceConfigCmd then return end |
23,7 → 24,6
| AceConfigCmd.commands = AceConfigCmd.commands or {} |
| local commands = AceConfigCmd.commands |
| local cfgreg = LibStub("AceConfigRegistry-3.0") |
| local AceConsole -- LoD |
| local AceConsoleName = "AceConsole-3.0" |
trunk/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
8,16 → 8,16
| -- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName". |
| -- @class file |
| -- @name AceConfigRegistry-3.0 |
| -- @release $Id: AceConfigRegistry-3.0.lua 1139 2016-07-03 07:43:51Z nevcairiel $ |
| local MAJOR, MINOR = "AceConfigRegistry-3.0", 16 |
| -- @release $Id: AceConfigRegistry-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $ |
| local CallbackHandler = LibStub("CallbackHandler-1.0") |
| local MAJOR, MINOR = "AceConfigRegistry-3.0", 17 |
| local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR) |
| if not AceConfigRegistry then return end |
| AceConfigRegistry.tables = AceConfigRegistry.tables or {} |
| local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0") |
| if not AceConfigRegistry.callbacks then |
| AceConfigRegistry.callbacks = CallbackHandler:New(AceConfigRegistry) |
| end |
trunk/SliceCommander.toc
1,6 → 1,6
| ## Interface: 70200 |
| ## Interface: 70300 |
| ## Author: Tomate |
| ## Version: 7.20 |
| ## Version: 7.21 |
| ## Title: |cffc14f2cSlice|r|cff40a740Commander|r |
| ## Notes: Energy bar, Combo point bar and rogue timer bar. |
| ## SavedVariables: SC |
trunk/Locale/spell.lua
11,6 → 11,7
| SC_SPELL['TOT'] = GetSpellInfo(57934) --Tricks of the Trade |
| SC_SPELL['SUB'] = GetSpellInfo(108208)--Subterfuge |
| SC_SPELL['SS'] = GetSpellInfo(36554) --Shadowstep |
| SC_SPELL['SSCD'] = GetSpellInfo(36554) --Shadowstep CD |
| SC_SPELL['CD'] = GetSpellInfo(45181) --Cheated Death |
| SC_SPELL['AC'] = GetSpellInfo(193538)--Alacrity |
| SC_SPELL['MD'] = GetSpellInfo(137619)--Marked for Death |
21,6 → 22,10
| SC_SPELL['FOTD'] = GetSpellInfo(109949)--Fury of the Destroyer |
| SC_SPELL['MAI'] = GetSpellInfo(235027)--Master Assassin's Initiative |
| SC_SPELL['KI'] = GetSpellInfo(1766) --Kick |
| SC_SPELL['EV'] = GetSpellInfo(5277) --Evasion |
| SC_SPELL['EVCD'] = GetSpellInfo(5277) --Evasion CD |
| SC_SPELL['COS'] = GetSpellInfo(31224) --Cloak of Shadows |
| SC_SPELL['COSCD'] = GetSpellInfo(31224) --Cloak of Shadows CD |
| --OUTLAW |
| SC_SPELL['SND'] = GetSpellInfo(5171) --Slice and Dice |
48,6 → 53,8
| SC_SPELL['BB'] = GetSpellInfo(202895)--Blunderbuss |
| SC_SPELL['RT'] = GetSpellInfo(208225)--Run Through |
| SC_SPELL['LD'] = GetSpellInfo(240837)--Loaded Dice |
| SC_SPELL['RI'] = GetSpellInfo(199754)--Riposte |
| SC_SPELL['RICD'] = GetSpellInfo(199754)--Riposte CD |
| --ASSASSINAT |
| SC_SPELL['HEM'] = GetSpellInfo(16511) --Hemorrhage |
trunk/SliceCommander.lua
26,7 → 26,7
| numberPos = 0 |
| numberNeg = 0 |
| for i = 1, 25 do |
| for i = 1, 30 do |
| for j,v in pairs(SC.BARS) do |
| if v['obj']:IsVisible() and v['expire'] == 0 then |
| v['obj']:Hide() |
471,12 → 471,16
| local mhPoison = SC.SET.poison.mh |
| local ohPoison = SC.SET.poison.oh |
| local _, _, _, selected = GetTalentInfo(4, 1, 1) |
| if not selected then |
| if not selected and ohPoison == SC_SPELL['LP'] then |
| ohPoison = SC_SPELL['CRP'] |
| end |
| local name, _, _, _, _, _, expirationTime = UnitAura("player", mhPoison, nil, "PLAYER") |
| local name2, _, _, _, _, _, expirationTime2 = UnitAura("player", ohPoison, nil, "PLAYER") |
| local name2 = name |
| local expirationTime2 = expirationTime |
| if ohPoison ~= 'none' then |
| name2, _, _, _, _, _, expirationTime2 = UnitAura("player", ohPoison, nil, "PLAYER") |
| end |
| local minimalTime = SC.SET.display.DPTIME*60 |
trunk/Core/Settings.lua
26,7 → 26,7
| selected[v] = selected[v] .. ', ' .. _G['SC'].BARS[string.upper(k)]['name'] .. cd |
| end |
| end |
| for key = -25, 25, 1 do |
| for key = -30, 30, 1 do |
| if key ~= 0 then |
| if not selected[key] then |
| returnArray[key] = key .. '. ' .. L['**Empty**'] |
440,6 → 440,7
| KS = SliceCommander:getSpellCDSettings('KS'), |
| CS = SliceCommander:getSpellSettings('CS'), |
| MAI = SliceCommander:getSpellSettings('MAI'), |
| COS = SliceCommander:getSpellCDSettings('COS'), |
| FOTD = { |
| order = SliceCommander:getOrder(), |
| name = SC_SPELL['FOTD'], |
483,7 → 484,8
| HEM = SliceCommander:getSpellSettings('HEM'), |
| EP = SliceCommander:getSpellSettings('EP'), |
| SUB = SliceCommander:getSpellSettings('SUB'), |
| SS = SliceCommander:getSpellSettings('SS'), |
| SS = SliceCommander:getSpellCDSettings('SS'), |
| EV = SliceCommander:getSpellCDSettings('EV'), |
| DP = SliceCommander:getSpellSettings('DP'), |
| EnergySetting = SliceCommander:getEnergyMarkerSettings(1), |
| POISON = { |
567,12 → 569,20
| name = L["Utility poison"], |
| type = "select", |
| values = function() |
| return { [SC_SPELL['CRP']] = SC_SPELL['CRP'], [SC_SPELL['LP']] = SC_SPELL['LP'] } |
| return { ['none'] = L["None"], [SC_SPELL['CRP']] = SC_SPELL['CRP'], [SC_SPELL['LP']] = SC_SPELL['LP'] } |
| end, |
| set = function(info,val) |
| if val ~= SC_SPELL['LP'] or selected then |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", val) |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", val) |
| local aSpec = GetSpecialization() |
| if aSpec == 1 and val == SC_SPELL['LP'] then--POISONS |
| local _, _, _, selected = GetTalentInfo(4, 1, 1) |
| if not selected then |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", SC_SPELL['CRP']) |
| end |
| end |
| if val == 'none' then |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", nil) |
| end |
| SC.SET.poison.oh = val |
| end, |
| get = function(info) |
694,6 → 704,7
| }, |
| PA = SliceCommander:getCDSettings('PA'), |
| GSWW = SliceCommander:getSpellSettings('GSWW'), |
| RI = SliceCommander:getSpellCDSettings('RI'), |
| EnergySetting = SliceCommander:getEnergyMarkerSettings(2), |
| } |
| } |
710,7 → 721,8
| NB = SliceCommander:getSpellSettings('NB'), |
| SOD = SliceCommander:getSpellCDSettings('SOD'), |
| SUB = SliceCommander:getSpellSettings('SUB'), |
| SS = SliceCommander:getSpellSettings('SS'), |
| SS = SliceCommander:getSpellCDSettings('SS'), |
| EV = SliceCommander:getSpellCDSettings('EV'), |
| EnergySetting = SliceCommander:getEnergyMarkerSettings(3), |
| } |
| } |
1152,12 → 1164,9
| end |
| function SliceCommander:ResetOptions() |
| SC.SET = nil |
| SliceCommander:TestValueOptions() |
| if SC.BARS['SND']['obj'] ~= 0 then |
| SliceCommander:ApplyConf() |
| LibStub("AceConfigRegistry-3.0"):NotifyChange("SliceCommander") |
| end |
| SliceCommander:OnDisable() |
| SliceCommanderFrame:SetScript("OnUpdate", null) |
| _G['SC'] = { PopupDialogs = null } |
| SliceCommander:StaticPopup_Show('CONFIG_RL') |
| end |
trunk/Core/Event.lua
87,12 → 87,16
| local aSpec = GetSpecialization() |
| if aSpec == 1 then--POISONS |
| local _, _, _, selected = GetTalentInfo(4, 1, 1) |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell1", SC.SET.poison.mh) |
| if selected then |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", SC.SET.poison.oh) |
| if SC.SET.poison.oh == 'none' then |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", nil) |
| else |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", SC_SPELL['CRP']) |
| local _, _, _, selected = GetTalentInfo(4, 1, 1) |
| if selected then |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", SC.SET.poison.oh) |
| else |
| SC.OTHER['POISON']['obj'].button:SetAttribute("spell2", SC_SPELL['CRP']) |
| end |
| end |
| end |
| end |
trunk/Core/Config.lua
149,6 → 149,9
| SC.BARS['DFA']['obj'].icon:SetTexture("Interface\\Icons\\spell_rogue_deathfromabove") |
| SC.BARS['CVCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_rogue_crimsonvial") |
| SC.BARS['KI']['obj'].icon:SetTexture("Interface\\Icons\\ability_kick") |
| SC.BARS['SSCD']['obj'].icon:SetTexture("Interface\\Icons\\ability_rogue_shadowstep") |
| SC.BARS['EVCD']['obj'].icon:SetTexture("Interface\\Icons\\spell_shadow_shadowward") |
| SC.BARS['COSCD']['obj'].icon:SetTexture("Interface\\Icons\\spell_shadow_nethercloak") |
| --ASSASSINATION |
| SC.BARS['VENCD']['obj'].icon:SetTexture("Interface\\Icons\\Ability_Rogue_Deadliness") |
166,6 → 169,7
| SC.BARS['BE']['obj'].icon:SetTexture("Interface\\Icons\\inv_weapon_rifle_01") |
| SC.BARS['RB']['obj'].icon:SetTexture("Interface\\Icons\\ability_rogue_rollthebones") |
| SC.BARS['CDBCD']['obj'].icon:SetTexture("Interface\\Icons\\inv_sword_1h_artifactskywall_d_01dual") |
| SC.BARS['RICD']['obj'].icon:SetTexture("Interface\\Icons\\ability_parry") |
| --SUBTLETY |
| SC.BARS['SDCD']['obj'].icon:SetTexture("Interface\\Icons\\Ability_Rogue_Shadowdance") |
515,8 → 519,8
| end |
| function SliceCommander:Global() |
| SliceCommander:DisplaySpells({'CP', 'THREAT', 'CS', 'KS', 'KSCD', 'FOTD', 'CV', 'CVCD', 'TOT', 'FE', 'SS', 'SUB', 'CD', 'AC', 'MD', 'DFA', 'Poison', 'SOTD', 'MAI' }) |
| SliceCommander:NotDisplaySpells({'HEALTH', 'THEALTH', 'VAN', 'KI'}) |
| SliceCommander:DisplaySpells({'CP', 'THREAT', 'CS', 'KS', 'KSCD', 'FOTD', 'CV', 'CVCD', 'TOT', 'FE', 'SSCD', 'SUB', 'CD', 'AC', 'MD', 'DFA', 'Poison', 'SOTD', 'MAI' }) |
| SliceCommander:NotDisplaySpells({'HEALTH', 'THEALTH', 'VAN', 'KI', 'EV', 'EVCD', 'COS', 'COSCD', 'SS'}) |
| _G['SC'].orderBar = _G['SC'].maxPos |
| _G['SC'].orderCDBar = _G['SC'].maxCDPos |
525,8 → 529,8
| SC.SET.Pos.CP = -1 |
| end |
| SliceCommander:OrderSpells({'FOTD', 'CV', 'FE', 'SUB', 'AC', 'MAI'}) |
| SliceCommander:OrderCDs({'CVCD', 'TOT', 'VAN', 'SS', 'CD', 'MD', 'DFA', 'THREAT', 'HEALTH', 'THEALTH', 'CS', 'KS', 'KSCD', 'KI'}) |
| SliceCommander:OrderSpells({'FOTD', 'CV', 'FE', 'SUB', 'AC', 'MAI', 'SS', 'EV', 'COS'}) |
| SliceCommander:OrderCDs({'CVCD', 'TOT', 'VAN', 'SSCD', 'CD', 'MD', 'DFA', 'THREAT', 'HEALTH', 'THEALTH', 'CS', 'KS', 'KSCD', 'KI', 'EVCD', 'COSCD'}) |
| end |
| function SliceCommander:Assassination() |
542,13 → 546,13
| function SliceCommander:Outlaw() |
| SliceCommander:DisplaySpells({'SND', 'RB', 'AR', 'ARCD', 'CDB', 'CDBCD', 'KSP', 'GS', 'GH', 'CB', 'BE', 'BF', 'OP', 'GSWW', 'BB', 'LD'}) |
| SliceCommander:NotDisplaySpells({'PA'}) |
| SliceCommander:NotDisplaySpells({'PA', 'RI', 'RICD'}) |
| _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', 'LD'}) |
| SliceCommander:OrderSpells({'SND', 'RB', 'AR', 'GS', 'OP', 'CDB', 'GSWW', 'RI'}) |
| SliceCommander:OrderCDs({'BE', 'ARCD', 'KSP', 'CB', 'GH', 'PA', 'CDBCD', 'LD', 'RICD'}) |
| end |
| function SliceCommander:Subtlety() |
781,8 → 785,8
| SC.OTHER['BF'] = { |
| ['obj'] = 0, |
| ['position'] = { |
| ['xOfs'] = 45, |
| ['yOfs'] = 0, |
| ['xOfs'] = 75, |
| ['yOfs'] = 150, |
| ['relativePoint'] = "CENTER", |
| ['point'] = "CENTER", |
| ['relativeTo'] = "UIParent" |
793,8 → 797,8
| SC.OTHER['BB'] = { |
| ['obj'] = 0, |
| ['position'] = { |
| ['xOfs'] = 60, |
| ['yOfs'] = 0, |
| ['xOfs'] = -75, |
| ['yOfs'] = 150, |
| ['relativePoint'] = "CENTER", |
| ['point'] = "CENTER", |
| ['relativeTo'] = "UIParent" |
807,8 → 811,8
| ['iconTxt'] = 0, |
| ['overlay'] = false, |
| ['position'] = { |
| ['xOfs'] = 30, |
| ['yOfs'] = 0, |
| ['xOfs'] = 25, |
| ['yOfs'] = 150, |
| ['relativePoint'] = "CENTER", |
| ['point'] = "CENTER", |
| ['relativeTo'] = "UIParent" |
828,8 → 832,8
| ['expire'] = 0, |
| ['color'] = 0, |
| ['position'] = { |
| ['xOfs'] = 0, |
| ['yOfs'] = 0, |
| ['xOfs'] = -25, |
| ['yOfs'] = 150, |
| ['relativePoint'] = "CENTER", |
| ['point'] = "CENTER", |
| ['relativeTo'] = "UIParent" |
839,8 → 843,8
| if SC.OTHER['SliceCommanderFrame'] == nil then |
| SC.OTHER['SliceCommanderFrame'] = { |
| ['position'] = { |
| ['xOfs'] = 0, |
| ['yOfs'] = 0, |
| ['xOfs'] = -250, |
| ['yOfs'] = 75, |
| ['relativePoint'] = "CENTER", |
| ['point'] = "CENTER", |
| ['relativeTo'] = "UIParent" |
885,6 → 889,9
| if SC.BARS['SS'] == nil then--Shadowstep |
| SC.BARS['SS'] = {['color'] = {.76, .28, .78}} |
| end |
| if SC.BARS['SSCD'] == nil then--Shadowstep CD |
| SC.BARS['SSCD'] = {['color'] = {.76, .28, .78}} |
| end |
| if SC.BARS['FE'] == nil then--Feint |
| SC.BARS['FE'] = {['color'] = {.15, .42, .68}} |
| end |
922,6 → 929,18
| if SC.BARS['TOT'] == nil then--Tricks of the Trade |
| SC.BARS['TOT'] = {['color'] = {.3, .3, 1}} |
| end |
| if SC.BARS['EV'] == nil then--Evasion |
| SC.BARS['EV'] = {['color'] = {.42, .46, .51}} |
| end |
| if SC.BARS['EVCD'] == nil then--Evasion CD |
| SC.BARS['EVCD'] = {['color'] = {.42, .46, .51}} |
| end |
| if SC.BARS['COS'] == nil then--Cloak of Shadows |
| SC.BARS['COS'] = {['color'] = {.52, .18, .54}} |
| end |
| if SC.BARS['COSCD'] == nil then--Cloak of Shadows CD |
| SC.BARS['COSCD'] = {['color'] = {.52, .18, .54}} |
| end |
| end |
| function SliceCommander:InitAssassinationBarArray() |
1029,6 → 1048,12
| if SC.BARS['LD'] == nil then--Loaded Dice |
| SC.BARS['LD'] = {['color'] = {.63, .52, .38}} |
| end |
| if SC.BARS['RI'] == nil then--Riposte |
| SC.BARS['RI'] = {['color'] = {.42, .46, .51}} |
| end |
| if SC.BARS['RICD'] == nil then--Riposte CD |
| SC.BARS['RICD'] = {['color'] = {.42, .46, .51}} |
| end |
| end |
| function SliceCommander:InitSubtletyBarArray()--http://paletton.com/#uid=64r0u0kleqtbzEKgVuIpcmGtdhZ |
1082,7 → 1107,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', 'LD'} |
| local buff = {'FOTD', 'AR', 'SUB', 'EP', 'CV', 'AC', 'FE', 'SND', 'SD', 'SOD', 'SB', 'OP', 'ENV', 'GB', 'GSWW', 'MAI', 'LD', 'SS', 'EV', 'COS', 'RI'} |
| for i, v in ipairs(buff) do |
| SC.BARS[v]['type'] = 1 |
| end |
1097,12 → 1122,13
| SC.BARS[v]['type'] = 3 |
| end |
| local cd = {'SS', 'VAN', 'KSP', 'ARCD', 'CDBCD', 'CVCD', 'MD', 'GH', 'PA', 'CB', 'BE', 'TOT', 'SDCD', 'SBCD', 'VENCD', 'GBCD', 'EX', 'GARCD', 'KBCD', 'KSCD', 'DFA', 'KI', 'TXBCD', 'SODCD'} |
| local cd = {'VAN', 'KSP', 'ARCD', 'CDBCD', 'CVCD', 'MD', 'GH', 'PA', 'CB', 'BE', 'TOT', 'SDCD', 'SBCD', 'VENCD', 'GBCD', 'EX', 'GARCD', 'KBCD', 'KSCD', 'DFA', 'KI', 'TXBCD', 'SODCD', 'EVCD', 'COSCD', 'RICD'} |
| 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['RB']['type'] = 6 |
| --[[local chargecd = {'SDCD'} |
| for i, v in ipairs(chargecd) do |
WoWInterface
AddOn Sites
© 2004 - 2022 MMOUI
vBulletin © 2024, Jelsoft Enterprises Ltd