Skip to content

Commit 95f0832

Browse files
kodewdlekodewdle
committed
Merge branch 'main' into classic-beta
2 parents 87b141a + e6d9c23 commit 95f0832

File tree

8 files changed

+275
-220
lines changed

8 files changed

+275
-220
lines changed

‎ElvUI/Classic/Filters/Filters.lua

+37
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,30 @@ if E.ClassicSOD then
661661
RaidDebuffs[438732] = List(2) -- Toxic Ventilation
662662
RaidDebuffs[438735] = List(2) -- High Voltage!
663663
RaidDebuffs[438720] = List(2) -- Freezing
664+
----------------------------------------------------------
665+
---------------------- Sunken Temple ---------------------
666+
----------------------------------------------------------
667+
-- Atal'alarion
668+
RaidDebuffs[437617] = List(2) -- Demolishing Smash
669+
-- Festering Rotslime
670+
RaidDebuffs[438142] = List(3) -- Gunk
671+
-- Atal'ai Defenders
672+
RaidDebuffs[446354] = List(2) -- Shield Slam
673+
RaidDebuffs[446373] = List(2) -- Corrupted Slam
674+
-- Dreamscythe and Weaver
675+
RaidDebuffs[442622] = List(2) -- Acid Breath
676+
-- Jammal'an and Ogom
677+
RaidDebuffs[437868] = List(3) -- Agonizing Weakness
678+
RaidDebuffs[437847] = List(6) -- Mortal Lash
679+
-- Morphaz and Hazzas
680+
RaidDebuffs[445158] = List(2) -- Lucid Dreaming
681+
RaidDebuffs[445555] = List(3) -- On Fire!!
682+
-- Shade of Eranikus
683+
RaidDebuffs[437390] = List(6) -- Lethargic Poison
684+
RaidDebuffs[437324] = List(2) -- Deep Slumber
685+
-- Avatar of Hakkar
686+
RaidDebuffs[444255] = List(6) -- Corrupted Blood
687+
RaidDebuffs[444165] = List(5) -- Skeletal
664688
end
665689

666690
--[[
@@ -724,6 +748,19 @@ if E.ClassicSOD then
724748
RaidBuffs[436837] = List(2) -- Widget Fortress
725749
-- Mekgineer Thermaplugg
726750
RaidBuffs[438715] = List(2) -- Furnace Surge
751+
----------------------------------------------------------
752+
---------------------- Sunken Temple ---------------------
753+
----------------------------------------------------------
754+
-- Atal'ai Defenders
755+
RaidBuffs[446356] = List(2) -- Improved Blocking
756+
-- Dreamscythe and Weaver
757+
RaidBuffs[443302] = List(6) -- Emerald Ward
758+
-- Jammal'an and Ogom
759+
RaidBuffs[437791] = List(6) -- Ritual Leader
760+
-- Shade of Eranikus
761+
RaidBuffs[437410] = List(6) -- Deep Slumber
762+
-- Avatar of Hakkar
763+
RaidBuffs[443917] = List(2) -- Tides of Blood
727764
end
728765

729766
G.unitframe.aurawatch = {

‎ElvUI/Core/Modules/Chat/Chat.lua

+195-191
Large diffs are not rendered by default.

‎ElvUI/Core/Modules/DataTexts/Difficulty.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ local DiffIDLabel = { -- also has IDs maintained in Nameplate StyleFilters
5050
['N'] = { 1, 14, 38, 173, 198, 201 },
5151
['H'] = { 2, 15, 39, 174 },
5252
['M'] = { 16, 23, 40 },
53-
['20'] = { 148, 185 },
53+
['20'] = { 148, 185, 215 },
5454
['10N'] = { 3, 175 },
5555
['25N'] = { 4, 176 },
5656
['10H'] = { 5, 193 },

‎ElvUI/Core/Modules/DataTexts/Time.lua

+24-11
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,22 @@ local displayFormats = {
4949
eu_color = ''
5050
}
5151

52+
local allowID = { -- also has IDs maintained in Nameplate StyleFilters
53+
[2] = true, -- heroic
54+
[23] = true, -- mythic
55+
[148] = true, -- ZG/AQ40
56+
[174] = true, -- heroic (dungeon)
57+
[185] = true, -- normal (legacy)
58+
[198] = true, -- Classic: Season of Discovery
59+
[201] = true, -- Classic: Hardcore
60+
[215] = true, -- Classic: Sunken Temple
61+
}
62+
63+
local lfrID = {
64+
[7] = true,
65+
[17] = true
66+
}
67+
5268
local OnUpdate, db
5369

5470
local function ToTime(start, seconds)
@@ -212,17 +228,14 @@ local function OnEnter()
212228
for i = 1, GetNumSavedInstances() do
213229
local info = { GetSavedInstanceInfo(i) } -- we want to send entire info
214230
local name, _, _, difficulty, locked, extended, _, isRaid = unpack(info)
215-
if name and (locked or extended) then
216-
local isDungeon = difficulty == 2 or difficulty == 23 or difficulty == 174 or difficulty == 198 or difficulty == 201
217-
if isRaid or isDungeon then
218-
local isLFR = difficulty == 7 or difficulty == 17
219-
local _, _, isHeroic, _, displayHeroic, displayMythic = GetDifficultyInfo(difficulty)
220-
local sortName = name .. (displayMythic and 4 or (isHeroic or displayHeroic) and 3 or isLFR and 1 or 2)
221-
local difficultyLetter = (displayMythic and difficultyTag[4]) or ((isHeroic or displayHeroic) and difficultyTag[3]) or (isLFR and difficultyTag[1]) or difficultyTag[2]
222-
local buttonImg = instanceIconByName[name] and format('|T%s:16:16:0:0:96:96:0:64:0:64|t ', instanceIconByName[name]) or ''
223-
224-
tinsert(lockedInstances[isRaid and 'raids' or 'dungeons'], { sortName, difficultyLetter, buttonImg, info })
225-
end
231+
if name and (locked or extended) and (isRaid or allowID[difficulty]) then
232+
local isLFR = lfrID[difficulty]
233+
local _, _, isHeroic, _, displayHeroic, displayMythic = GetDifficultyInfo(difficulty)
234+
local sortName = name .. (displayMythic and 4 or (isHeroic or displayHeroic) and 3 or isLFR and 1 or 2)
235+
local difficultyLetter = (displayMythic and difficultyTag[4]) or ((isHeroic or displayHeroic) and difficultyTag[3]) or (isLFR and difficultyTag[1]) or difficultyTag[2]
236+
local buttonImg = instanceIconByName[name] and format('|T%s:16:16:0:0:96:96:0:64:0:64|t ', instanceIconByName[name]) or ''
237+
238+
tinsert(lockedInstances[isRaid and 'raids' or 'dungeons'], { sortName, difficultyLetter, buttonImg, info })
226239
end
227240
end
228241

‎ElvUI/Core/Modules/Misc/RaidUtility.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function RU:SetEnabled(button, enabled, isLeader)
7777
if button.SetChecked then
7878
button:SetChecked(enabled)
7979
else
80-
button:SetEnabled(enabled)
80+
button.enabled = enabled
8181
end
8282

8383
if button.Text then -- show text grey when isLeader is false, nil and true should be white
@@ -295,7 +295,7 @@ function RU:OnEvent_ReadyCheckButton()
295295
end
296296

297297
function RU:OnClick_ReadyCheckButton()
298-
if RU:InGroup() then
298+
if self.enabled and RU:InGroup() then
299299
DoReadyCheck()
300300
end
301301
end
@@ -305,7 +305,7 @@ function RU:OnEvent_RoleCheckButton()
305305
end
306306

307307
function RU:OnClick_RoleCheckButton()
308-
if RU:InGroup() then
308+
if self.enabled and RU:InGroup() then
309309
InitiateRolePoll()
310310
end
311311
end

‎ElvUI/Core/Modules/Nameplates/StyleFilter.lua

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ NP.TriggerConditions = {
143143
[174] = 'heroic',
144144
[185] = 'legacy20normal',
145145
[186] = 'legacy40normal',
146+
[215] = 'normal', -- Classic: Sunken Temple
146147
-- wotlk
147148
[175] = 'legacy10normal',
148149
[176] = 'legacy25normal',

‎ElvUI/Core/Modules/UnitFrames/UnitFrames.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ do -- IDs maintained in Difficulty Datatext and Nameplate StyleFilters
561561
dungeonHeroic = {2, 39, 174},
562562
dungeonMythic = {23, 40},
563563
dungeonMythicKeystone = {8},
564-
raidNormal = {3, 4, 14, 148, 175, 176, 185, 186}, -- 148 is ZG/AQ40
564+
raidNormal = {3, 4, 14, 148, 175, 176, 185, 186, 215}, -- 148 is ZG/AQ40, 215 is Sunken Temple
565565
raidHeroic = {5, 6, 15, 193, 194},
566566
raidMythic = {16},
567567
}

‎ElvUI_Options/Locales/ruRU.lua

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ L["LEFT"] = "Слева"
1616
L["RIGHT"] = "Справа"
1717
L["TOP"] = "Вверху"
1818

19-
L["Primary Unit"] = true
20-
L["Requires the unit to be the primary target to display."] = true
21-
L["Pet Specific"] = true
22-
L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = true
19+
L["Primary Unit"] = "Основная цель"
20+
L["Requires the unit to be the primary target to display."] = "Отображается, когда юнит является основной целью"
21+
L["Pet Specific"] = "Только для пета"
22+
L["Use the profile specific filter Aura Indicator (Pet) instead of the global filter Aura Indicator."] = "Использовать зависящий от профиля фильтр Aura Indicator (Pet) вместо глобального фильтра Aura Indicator."
2323
L["%s and then %s"] = "%s, а затем %s"
2424
L["24-Hour Time"] = "24х часовой формат"
2525
L["2D"] = "2D" --Doesn't need translation
@@ -40,13 +40,13 @@ L["Add / Remove"] = "Добавить/Удалить"
4040
L["Add a Item Name or ID to the list."] = "Добавить название или ID предмета в список."
4141
L["Add a Name or NPC ID to the list."] = "Добавить имя или ID НИПа в список."
4242
L["Add a spell to the filter."] = "Добавить заклинание в фильтр"
43-
L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = true
43+
L["Add an Item by dragging it, shift-clicking, or entering the Item ID onto this field."] = "Добавьте предмет, перетащив его, через Shift+ЛКМ или введя его ID в это поле."
4444
L["Add Currency by ID"] = "Добавить ID валюты"
4545
L["Add Currency"] = "Добавить валюту"
4646
L["Add Current"] = "Добавить текущее"
4747
L["Add Instance ID"] = "Добавить ID подземелья"
4848
L["Add Item Name or ID"] = "Добавить название или ID предмета"
49-
L["Add Item"] = true
49+
L["Add Item"] = "Добавить предмет"
5050
L["Add Map ID"] = "Добавить ID карты"
5151
L["Add Name or NPC ID"] = "Добавить имя или ID НИПа"
5252
L["Add Regular Filter"] = "Добавить обычный фильтр"
@@ -602,15 +602,15 @@ L["ENERGY"] = "Энергия"
602602
L["Energy/Mana Regen Tick"] = "Метка восстановления маны/энергии"
603603
L["Engineering"] = "Инженерия"
604604
L["Enhanced PVP Messages"] = "Улучшенные PvP сообщения"
605-
L["Equipped Item"] = true
605+
L["Equipped Item"] = "Надетый предмет"
606606
L["Equipped"] = "Надето"
607607
L["Error decoding data. Import string may be corrupted!"] = "Ошибка при кодировании. Импортируемая строка может быть повреждена!"
608608
L["Error exporting profile!"] = "Ошибка при экспорте профиля!"
609609
L["Event Log"] = "Журнал событий"
610610
L["Exclude Name"] = "Исключить имя"
611611
L["Excluded names will not be class colored."] = "Исключенные имена не окрашиваются в цвет класса"
612612
L["Excluded Names"] = "Исключенные имена"
613-
L["Expansion Button"] = true
613+
L["Expansion Button"] = "Кнопка дополнения"
614614
L["Expansion Landing Page"] = "Страница дополнения"
615615
L["Expiring"] = "Завершение"
616616
L["Export Now"] = "Экспортировать"
@@ -750,7 +750,7 @@ L["Height"] = "Высота"
750750
L["Help Frame"] = "Помощь"
751751
L["Help"] = "Помощь"
752752
L["Herbalism"] = "Травы"
753-
L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = true
753+
L["Here you can add items that you want to be excluded from sorting. To remove an item just click on its name in the list."] = "Здесь вы можете добавить предметы, которые вы хотите исключить из сортировки. Для удаления предмета из списка, кликните по его названию в списке."
754754
L["HH:MM Threshold"] = "Граница ЧЧ:ММ"
755755
L["HH:MM"] = "ЧЧ:ММ"
756756
L["Hide At Max Level"] = "Прятать на максимальном уровне"
@@ -887,8 +887,8 @@ L["If you have a lot of 3D Portraits active then it will likely have a big impac
887887
L["If you have any plugins supporting this feature installed you can find them in the selection dropdown to the right."] = "Если у Вас установлены плагины, которые поддерживают этот функционал, Вы можете найти их в выпадающем списке справа."
888888
L["If you unlock actionbars then trying to move a spell might instantly cast it if you cast spells on key press instead of key release."] = "Если Вы разблокируете панели, а затем попытаетесь переместить заклинание, оно может быть применено мгновенно, если включено применение при нажатии."
889889
L["Ignore mouse events."] = "Игнорировать мышь"
890-
L["Ignored Items (Global)"] = true
891-
L["Ignored Items (Profile)"] = true
890+
L["Ignored Items (Global)"] = "Игнорируемые предметы (Глобально)"
891+
L["Ignored Items (Profile)"] = "Игнорируемые предметы (Профиль)"
892892
L["Import Now"] = "Импортировать"
893893
L["Import Profile"] = "Импорт профиля"
894894
L["Import"] = "Импорт"
@@ -1636,7 +1636,7 @@ L["Target Indicator Color"] = "Цвет индикатора цели"
16361636
L["Target Info"] = "Информация о цели"
16371637
L["Target Marker Icon"] = "Метка цели"
16381638
L["Target On Mouse-Down"] = "Выделение при нажатии"
1639-
L["Target Reticle"] = true
1639+
L["Target Reticle"] = "Текстура прицеливания"
16401640
L["Target units on mouse down rather than mouse up.\n|cffff3333Note:|r If Clique is enabled, this option only effects ElvUI frames if they are not blacklisted in Clique."] = "Выделять цели при нажатии, а не отпускании кнопки мыши.\n|cffff3333Внимание:|r Если включен Clique, то опция будет работать только если рамки ElvUI не заигнорены в нем."
16411641
L["Target"] = "Цель"
16421642
L["Target/Low Health Indicator"] = "Индикатор цели"
@@ -1876,7 +1876,7 @@ L["World Latency"] = "Глобальная задержка"
18761876
L["World Map Coordinates"] = "Координаты карты мира"
18771877
L["WORLD_MAP"] = "Карта мира"
18781878
L["Wrap After"] = "Размер ряда"
1879-
L["Wrapped"] = true
1879+
L["Wrapped"] = "Обычный + Обратный"
18801880
L["X-Offset"] = "Отступ по X"
18811881
L["XP Quest Percent"] = "Процент опыта задания"
18821882
L["Y-Offset"] = "Отступ по Y"

0 commit comments

Comments
 (0)