Skip to content

Commit 2d5f7ef

Browse files
committed
(fix/Modernize): Add note about Combo Points player/vehicle limitation and lift unit restriction
1 parent 6791d5a commit 2d5f7ef

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

WeakAuras/Locales/zLocales.lua

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ local locale = GAME_LOCALE or GetLocale()
55
-- This File adds Custom Localization for
66
-- Specializations, Creature Types, Creature Families, TimeUtils and BossNames
77
if (locale == "enUS" or locale == "enGB") then
8+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."
89
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"
910
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"
1011
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Requires Deadly Boss Mods (DBM) to detect encounters."
@@ -194,6 +195,7 @@ if (locale == "enUS" or locale == "enGB") then
194195
end
195196

196197
elseif (locale == "deDE") then
198+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Hinweis: Combopunkte funktionieren nur für Spieler oder Fahrzeug. Die Auswahl von 'Spieler' prüft auch das Fahrzeug."
197199
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Begegnungsauslöser erfordert, dass Deadly Boss Mods (DBM) installiert und auf dem neuesten Stand ist.|r"
198200
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Begegnungs-Ladeoptionen erfordern, dass Deadly Boss Mods (DBM) installiert und auf dem neuesten Stand ist.|r"
199201
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Erfordert Deadly Boss Mods (DBM), um Begegnungen zu erkennen."
@@ -384,6 +386,7 @@ elseif (locale == "deDE") then
384386
end
385387

386388
elseif (locale == "esES") then
389+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Nota: Los puntos de combo solo funcionan para el jugador o el vehículo. Seleccionar 'jugador' también comprueba el vehículo."
387390
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000El disparador del encuentro requiere que Deadly Boss Mods (DBM) esté instalado y actualizado.|r"
388391
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Las opciones de carga del encuentro requieren que Deadly Boss Mods (DBM) esté instalado y actualizado.|r"
389392
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Requiere Deadly Boss Mods (DBM) para detectar encuentros."
@@ -573,6 +576,7 @@ elseif (locale == "esES") then
573576
end
574577

575578
elseif (locale == "esMX") then
579+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Nota: Los puntos de combo solo funcionan para el jugador o el vehículo. Seleccionar 'jugador' también verifica el vehículo."
576580
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000El disparador del encuentro requiere que Deadly Boss Mods (DBM) esté instalado y actualizado.|r"
577581
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Las opciones de carga del encuentro requieren que Deadly Boss Mods (DBM) esté instalado y actualizado.|r"
578582
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Requiere Deadly Boss Mods (DBM) para detectar encuentros."
@@ -762,6 +766,7 @@ elseif (locale == "esMX") then
762766
end
763767

764768
elseif (locale == "frFR") then
769+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Note : Les points de combo ne fonctionnent que pour le joueur ou le véhicule. Sélectionner « joueur » vérifie aussi le véhicule."
765770
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Le déclencheur de rencontre nécessite que Deadly Boss Mods (DBM) soit installé et à jour.|r"
766771
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Les options de chargement de la rencontre nécessitent que Deadly Boss Mods (DBM) soit installé et à jour.|r"
767772
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Nécessite Deadly Boss Mods (DBM) pour détecter les rencontres."
@@ -952,6 +957,7 @@ elseif (locale == "frFR") then
952957
end
953958

954959
elseif (locale == "itIT") then
960+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Nota: I punti combo funzionano solo per il giocatore o il veicolo. Selezionando 'giocatore' viene controllato anche il veicolo."
955961
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Il trigger dell’incontro richiede che Deadly Boss Mods (DBM) sia installato e aggiornato.|r"
956962
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Le opzioni di caricamento dell’incontro richiedono che Deadly Boss Mods (DBM) sia installato e aggiornato.|r"
957963
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Richiede Deadly Boss Mods (DBM) per rilevare gli incontri."
@@ -1146,6 +1152,7 @@ elseif (locale == "itIT") then
11461152
end
11471153

11481154
elseif (locale == "koKR") then
1155+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "참고: 연계 점수는 플레이어 또는 탈것에서만 작동합니다. '플레이어'를 선택하면 탈것도 함께 확인합니다."
11491156
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000보스전 트리거를 사용하려면 Deadly Boss Mods (DBM)이 설치되어 최신 상태여야 합니다.|r"
11501157
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000보스전 로드 옵션을 사용하려면 Deadly Boss Mods (DBM)이 설치되어 최신 상태여야 합니다.|r"
11511158
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "보스전을 감지하려면 Deadly Boss Mods (DBM)이 필요합니다."
@@ -1335,6 +1342,7 @@ elseif (locale == "koKR") then
13351342
end
13361343

13371344
elseif (locale == "ptBR") then
1345+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Nota: Pontos de combo funcionam apenas para jogador ou veículo. Selecionar 'jogador' também verifica o veículo."
13381346
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000O gatilho de encontro requer que Deadly Boss Mods (DBM) esteja instalado e atualizado.|r"
13391347
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000As opções de carregamento do encontro requerem que Deadly Boss Mods (DBM) esteja instalado e atualizado.|r"
13401348
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Requer Deadly Boss Mods (DBM) para detectar encontros."
@@ -1527,6 +1535,7 @@ elseif (locale == "ptBR") then
15271535
end
15281536

15291537
elseif (locale == "ruRU") then
1538+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "Примечание: Очки серии работают только для игрока или транспорта. Выбор «игрок» также проверяет транспорт."
15301539
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Триггер сражения с боссом требует, чтобы Deadly Boss Mods (DBM) был установлен и обновлён.|r"
15311540
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000Параметры загрузки сражения с боссом требуют, чтобы Deadly Boss Mods (DBM) был установлен и обновлён.|r"
15321541
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "Для обнаружения сражений с боссами требуется Deadly Boss Mods (DBM)."
@@ -1716,6 +1725,7 @@ elseif (locale == "ruRU") then
17161725
end
17171726

17181727
elseif (locale == "zhCN") then
1728+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "注意:连击点数仅对玩家或载具生效。选择“玩家”也会同时检测载具。"
17191729
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000首领战斗触发器需要已安装并更新到最新的 Deadly Boss Mods (DBM)。|r"
17201730
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000首领战斗加载选项需要已安装并更新到最新的 Deadly Boss Mods (DBM)。|r"
17211731
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "检测首领战斗需要 Deadly Boss Mods (DBM)。"
@@ -1905,6 +1915,7 @@ elseif (locale == "zhCN") then
19051915
end
19061916

19071917
elseif (locale == "zhTW") then
1918+
L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."] = "注意:連擊點數僅對玩家或載具生效。選擇「玩家」也會同時檢查載具。"
19081919
L["|cFFFF0000Encounter Trigger requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000首領戰觸發需要安裝並更新到最新版本的 Deadly Boss Mods (DBM)。|r"
19091920
L["|cFFFF0000Encounter load options requires Deadly Boss Mods (DBM) to be installed and up to date.|r"] = "|cFFFF0000首領戰載入選項需要安裝並更新到最新版本的 Deadly Boss Mods (DBM)。|r"
19101921
L["Requires Deadly Boss Mods (DBM) to detect encounters."] = "偵測首領戰需要 Deadly Boss Mods (DBM)。"

WeakAuras/Prototypes.lua

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2798,17 +2798,22 @@ Private.event_prototypes = {
27982798
test = "true",
27992799
store = true
28002800
},
2801+
{
2802+
name = "note",
2803+
type = "description",
2804+
display = "",
2805+
text = function()
2806+
return L["Note: Combo Points only work for player or vehicle. Selecting 'player' also checks vehicle."]
2807+
end,
2808+
enable = function(trigger)
2809+
return trigger.use_powertype and trigger.powertype == 4
2810+
end,
2811+
},
28012812
{
28022813
name = "powertype",
28032814
display = L["Power Type"],
28042815
type = "select",
2805-
values = function(trigger)
2806-
if trigger and trigger.unit ~= "player" then
2807-
return Private.power_types
2808-
else
2809-
return Private.power_types_player
2810-
end
2811-
end,
2816+
values = "power_types",
28122817
init = "powerTypeToCheck",
28132818
test = "true",
28142819
store = true,

WeakAuras/Types.lua

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,15 +1430,6 @@ Private.subevent_suffix_types = {
14301430
}
14311431

14321432
Private.power_types = {
1433-
[0] = MANA,
1434-
[1] = RAGE,
1435-
[2] = FOCUS,
1436-
[3] = ENERGY,
1437-
[6] = RUNIC_POWER,
1438-
[27] = HAPPINESS,
1439-
}
1440-
1441-
Private.power_types_player = {
14421433
[0] = MANA,
14431434
[1] = RAGE,
14441435
[2] = FOCUS,

0 commit comments

Comments
 (0)