diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 941aee0..b037785 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,10 @@ +v.2.22 +Additions: +- Additional option for garrison aotu work orders - shipyard. Darth suspects there will be time when its queue will be bigger then 1 ship so made this just in case. +Changes: +- Changed the way S&L interacts with oRA3. No more incompatibility popups. For the time being you can come across some issues when inspecting people wile using both armory mode for it and oRA. Hopefully will be fixed soon. A "Raid" option group will be disabled if you use oRA3 tho cause of similar functionality. + + v2.21 6/23/15 For preventing issues we recommend you to remove Shadow & Light and install it again instead of usual updating process due to some files have been moved or renamed. Also due to changes in settings tables you may experience errors on profile change or entering/leaving the zone. Those errors potentially can result in your profile being reset to defaults. We recommend you to backup your settings prior to loggin into the game in case we can't find all those. diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc index a10b80f..5610a93 100644 --- a/ElvUI_SLE/ElvUI_SLE.toc +++ b/ElvUI_SLE/ElvUI_SLE.toc @@ -1,7 +1,7 @@ ## Interface: 60200 ## Title: |cff1784d1ElvUI|r |cff9482c9Shadow & Light|r ## Author: Darth Predator, Repooc -## Version: 2.21 +## Version: 2.22 ## Notes: Plugin-edit for |cff1784d1ElvUI|r. ## Notes-ruRU: Плагин-редакция для |cff1784d1ElvUI|r. ## eMail: darthpred@gmail.com, repooc@tukui.org @@ -9,7 +9,7 @@ ## RequiredDeps: ElvUI ## OptionalDeps: AddonSkins, BigWigs, Clique, Hermes, xCT+ ## DefaultState: Enabled -## X-ElvVersion: 8.12 +## X-ElvVersion: 8.15 ## SavedVariables: SLE_ArmoryDB libs\load_libs.xml diff --git a/ElvUI_SLE/core/core.lua b/ElvUI_SLE/core/core.lua index 3a0d231..b52a57a 100644 --- a/ElvUI_SLE/core/core.lua +++ b/ElvUI_SLE/core/core.lua @@ -62,9 +62,9 @@ local function CheckIncompatible() if IsAddOnLoaded('LootConfirm') then E:StaticPopup_Show('LOOTCONFIRM_SLE_INCOMPATIBLE') end - if IsAddOnLoaded('oRA3') then - E:StaticPopup_Show('ORA_SLE_INCOMPATIBLE') - end + -- if IsAddOnLoaded('oRA3') then + -- E:StaticPopup_Show('ORA_SLE_INCOMPATIBLE') + -- end end function SLE:CreateExport() diff --git a/ElvUI_SLE/core/globals.lua b/ElvUI_SLE/core/globals.lua index 67bb0ef..7386fbf 100755 --- a/ElvUI_SLE/core/globals.lua +++ b/ElvUI_SLE/core/globals.lua @@ -28,6 +28,9 @@ local classTable = { warlock = blizzPath..[[ClassIcon_Warlock:16:16|t ]], warrior = blizzPath..[[ClassIcon_Warrior:16:16|t ]], } +--Check if oRA3 happens to be enabled +local enable = GetAddOnEnableState(E.myname, "oRA3") +if enable == 0 then SLE.oraenabled = false else SLE.oraenabled = true end E.SLEConfigs = {} diff --git a/ElvUI_SLE/defaults/profile.lua b/ElvUI_SLE/defaults/profile.lua index e141c33..88d8106 100644 --- a/ElvUI_SLE/defaults/profile.lua +++ b/ElvUI_SLE/defaults/profile.lua @@ -440,6 +440,7 @@ P['sle'] = { ['autoOrder'] = false, ['autoWar'] = false, ['autoTrade'] = false, + ['autoShip'] = false, }, ['errorframe'] = { diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index d84885e..97e6153 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -40,7 +40,6 @@ L["Reset All"] = "Сбросить все" L["Resets all movers & options for S&L."] = "Сбросить все фиксаторы и опции S&L" L['Oh lord, you have got ElvUI Enhanced and Shadow & Light both enabled at the same time. Select an addon to disable.'] = "Ешкин конь, одновременно включены ElvUI Enhanced и Shadow & Light. Выберите что отключить." L['You have got Loot Confirm and Shadow & Light both enabled at the same time. Select an addon to disable.'] = "Одновременно активны Loot Confirm и Shadow & Light. Выберите что из них отключить." -L['You have got oRA3 and Shadow & Light both enabled at the same time. Select an addon to disable.'] = "Одновременно активны oRA3 и Shadow & Light. Выберите что из них отключить." L["Enabling mouse over will make ElvUI's raid utility show on mouse over instead of always showing."] = "Отображать кнопку управления рейдом только при наведении мыши." L['Adjust the position of the threat bar to any of the datatext panels in ElvUI & S&L.'] = "Позволяет поместить полосу угрозы на любой панели инфо-текстов." L["This option have been moved by Shadow & Light. Click to access it's new place."] = "Shadow & Light переместил эту опцию. Кликните для перехода к ее новому расположению." @@ -490,6 +489,8 @@ L["Auto Work Orders for Warmill"] = "Авто. заказы на фабрике" L["Automatically queue maximum number of work orders available for Warmill/Dwarven Bunker."] = "Автоматически делать максимальное количество заказов для военной фабрики/дворфийского бункера." L["Auto Work Orders for Trading Post"] = "Авто. заказы в торговой лавке" L["Automatically queue maximum number of work orders available for Trading Post."] = "Автоматически делать максимальное количество заказов для торговой лавки." +L["Auto Work Orders for Shipyard"] = "Авто. заказы на верфи" +L["Automatically queue maximum number of work orders available for Shipyard."] = "Автоматически делать максимальное количество заказов для верфи." --Error Frame-- L["Error Frame"] = "Фрейм ошибок" diff --git a/ElvUI_SLE/modules/garrison.lua b/ElvUI_SLE/modules/garrison.lua index aebba06..ca25bf5 100644 --- a/ElvUI_SLE/modules/garrison.lua +++ b/ElvUI_SLE/modules/garrison.lua @@ -9,6 +9,7 @@ local buildID = { [111] = "Trade", [144] = "Trade", [145] = "Trade", + [205] = "Ship", } function G:SHIPMENT_CRAFTER_INFO(event, success, _, maxShipments, plotID) diff --git a/ElvUI_SLE/modules/raidroleicons.lua b/ElvUI_SLE/modules/raidroleicons.lua index f151f5a..c3bc96b 100644 --- a/ElvUI_SLE/modules/raidroleicons.lua +++ b/ElvUI_SLE/modules/raidroleicons.lua @@ -44,4 +44,7 @@ function B:RaidLoaded(event, addon) end end -B:RegisterEvent("ADDON_LOADED", "RaidLoaded") \ No newline at end of file +if not SLE.oraenabled then + B:RegisterEvent("ADDON_LOADED", "RaidLoaded") +end + diff --git a/ElvUI_SLE/options/garrison_c.lua b/ElvUI_SLE/options/garrison_c.lua index 6e96126..9486606 100644 --- a/ElvUI_SLE/options/garrison_c.lua +++ b/ElvUI_SLE/options/garrison_c.lua @@ -37,6 +37,15 @@ local function configTable() get = function(info) return E.db.sle.garrison.autoTrade end, set = function(info, value) E.db.sle.garrison.autoTrade = value end }, + autoShip = { + order = 6, + type = "toggle", + name = L["Auto Work Orders for Shipyard"], + desc = L["Automatically queue maximum number of work orders available for Shipyard."], + disabled = function() return not E.db.sle.garrison.autoOrder end, + get = function(info) return E.db.sle.garrison.autoShip end, + set = function(info, value) E.db.sle.garrison.autoShip = value end + }, }, } end diff --git a/ElvUI_SLE/options/raidroleicons_c.lua b/ElvUI_SLE/options/raidroleicons_c.lua index cd55b5c..bcc9a71 100644 --- a/ElvUI_SLE/options/raidroleicons_c.lua +++ b/ElvUI_SLE/options/raidroleicons_c.lua @@ -7,6 +7,7 @@ local function configTable() type = "group", name = RAID..[[ |TInterface\OptionsFrame\UI-OptionsFrame-NewFeatureIcon:0:0:0:-1|t]], order = 80, + disabled = function() return SLE.oraenabled end, args = { header = { order = 1,