From c3f11551422e9571dbf510cbafff77082a075648 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Wed, 5 Oct 2016 09:49:32 +0300 Subject: [PATCH] Raid progress update. Cause fuck Mera for making merge requests from master branch. This closes !11 --- ElvUI_SLE/locales/english.lua | 5 ++- ElvUI_SLE/locales/russian.lua | 5 ++- ElvUI_SLE/modules/tooltips/raidprogress.lua | 44 +++++++++------------------ 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index 5799e61..190fe03 100644 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -762,9 +762,8 @@ L["Tooltip X-offset"] = true L["Offset the tooltip on the X-axis."] = true L["Tooltip Y-offset"] = true L["Offset the tooltip on the Y-axis."] = true -L["RAID_HFC"] = "HFC" -L["RAID_BRF"] = "BRF" -L["RAID_HM"] = "HM" +L["RAID_NH"] = "NH" +L["RAID_EN"] = "EN" L["Raid Progression"] = true L["Show raid experience of character in tooltip (requires holding shift)."] = true diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index a78e903..3151ee6 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -752,9 +752,8 @@ L["Tooltip X-offset"] = "Смещение подсказки по X" L["Offset the tooltip on the X-axis."] = "Смещает подсказку по оси X относительно выбранной точки крепления." L["Tooltip Y-offset"] = "Смещение подсказки по Y" L["Offset the tooltip on the Y-axis."] = "Смещает подсказку по оси Y относительно выбранной точки крепления." -L["RAID_HFC"] = "ЦАП" -L["RAID_BRF"] = "ЛКЧГ" -L["RAID_HM"] = "ВМ" +L["RAID_NH"] = "ЦН" +L["RAID_EN"] = "ИК" L["Raid Progression"] = "Рейдовый прогресс" L["Show raid experience of character in tooltip (requires holding shift)."] = "Отображает рейдовый опыт данного персонажа (требуется зажатый shift)" diff --git a/ElvUI_SLE/modules/tooltips/raidprogress.lua b/ElvUI_SLE/modules/tooltips/raidprogress.lua index 0bbe41c..3845d6e 100644 --- a/ElvUI_SLE/modules/tooltips/raidprogress.lua +++ b/ElvUI_SLE/modules/tooltips/raidprogress.lua @@ -14,59 +14,43 @@ RP.playerGUID = UnitGUID("player") RP.highestKill = 0 RP.bosses = { - { -- HFC + { -- Emerald Nightmare { --Mythic - 10204, 10208, 10212, 10216, 10220, 10224, 10228, 10232, 10236, 10240, 10244, 10248, 10252, + 10914, 10923, 10927, 10919, 10931, 10935, 10939, }, { -- Herioc - 10203, 10207, 10211, 10215, 10219, 10223, 10227, 10231, 10235, 10239, 10243, 10247, 10251, + 10913, 10922, 10926, 10917, 10930, 10934, 10938, }, { -- Normal - 10202, 10206, 10210, 10214, 10218, 10222, 10226, 10230, 10234, 10238, 10242, 10246, 10250, + 10912, 10921, 10925, 10916, 10929, 10933, 10937, }, { -- LFR - 10201, 10205, 10209, 10213, 10217, 10221, 10225, 10229, 10233, 10237, 10241, 10245, 10249, + 10911, 10920, 10924, 10915, 10928, 10932, 10936, }, }, - { -- Blackrock Foundry + { -- Nighthold { --Mythic - 9319, 9323, 9329, 9333, 9338, 9342, 9353, 9357, 9361, 9365, + 10943, 10947, 10951, 10955, 10960, 10964, 10968, 10972, 10976, 10980 }, { -- Herioc - 9318, 9322, 9328, 9332, 9337, 9341, 9351, 9356, 9360, 9364, + 10942, 10946, 10950, 10954, 10959, 10963, 10967, 10971, 10975, 10979 }, { -- Normal - 9317, 9321, 9327, 9331, 9336, 9340, 9349, 9355, 9359, 9363, + 10941, 10945, 10949, 10953, 10957, 10962, 10966, 10970, 10974, 10978 }, { -- LFR - 9316, 9320, 9324, 9330, 9334, 9339, 9343, 9354, 9358, 9362, - }, - }, - { -- HighMaul - { -- Mythic - 9285, 9289, 9294, 9300, 9304, 9311, 9315, - }, - { -- Herioc - 9284, 9288, 9293, 9298, 9303, 9310, 9314, - }, - { --Normal - 9282, 9287, 9292, 9297, 9302, 9308, 9313, - }, - { --LFR - 9280, 9286, 9290, 9295, 9301, 9306, 9312, + 10940, 10944, 10948, 10952, 10956, 10961, 10965, 10969, 10973, 10977 }, }, } RP.Raids = { ["LONG"] = { - T.GetMapNameByID(1026), - T.GetMapNameByID(988), - T.GetMapNameByID(994) + T.GetMapNameByID(1094), + T.GetMapNameByID(1088), }, ["SHORT"] = { - L["RAID_HFC"], - L["RAID_BRF"], - L["RAID_HM"], + L["RAID_EN"], + L["RAID_NH"], }, } RP.modes = { -- 1.7.9.5