From 0e0c49ec70356d410e9b4c5ce5dbb4c2f1129aa7 Mon Sep 17 00:00:00 2001 From: NoM0Re Date: Mon, 24 Feb 2025 11:19:23 +0100 Subject: [PATCH] (fix/Prototypes) fix specs not localised, ruRU localisation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Special Thanks to 𒆜𝕲𝖔𝖔𝖉𝕲𝖚𝖞𒆜 --- WeakAuras/Locales/ruRU.lua | 10 +++--- WeakAuras/Prototypes.lua | 38 +++++++++++++++++------ WeakAuras/Types.lua | 62 +++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 46 deletions(-) diff --git a/WeakAuras/Locales/ruRU.lua b/WeakAuras/Locales/ruRU.lua index d5d1ef4..e9a2b03 100644 --- a/WeakAuras/Locales/ruRU.lua +++ b/WeakAuras/Locales/ruRU.lua @@ -1508,15 +1508,15 @@ L["Zul'Gurub"] = "Зул'Гуруб" L["Affliction"] = "Колдовство" L["Arcane"] = "Тайная магия" L["Arms"] = "Оружие" -L["Assassination"] = "Убийство" +L["Assassination"] = "Ликвидация" L["Balance"] = "Баланс" -L["Beast Mastery"] = "Чувство зверя" +L["Beast Mastery"] = "Повелитель зверей" L["Blood"] = "Кровь" L["Combat"] = "Бой" L["Demonology"] = "Демонология" L["Destruction"] = "Разрушение" L["Discipline"] = "Послушание" -L["Elemental"] = "Укрощение стихии" +L["Elemental"] = "Стихии" L["Enhancement"] = "Совершенствование" L["Feral Combat"] = "Сила зверя" L["Fire"] = "Огонь" @@ -1527,8 +1527,8 @@ L["Hybrid"] = "Гибрид" L["Marksmanship"] = "Стрельба" L["Protection"] = "Защита" L["Restoration"] = "Исцеление" -L["Retribution"] = "Возмездие" -L["Shadow"] = "Темная магия" +L["Retribution"] = "Воздаяние" +L["Shadow"] = "Тьма" L["Subtlety"] = "Скрытность" L["Survival"] = "Выживание" L["Unholy"] = "Нечестивость" diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua index 40668d4..c545f10 100644 --- a/WeakAuras/Prototypes.lua +++ b/WeakAuras/Prototypes.lua @@ -5606,7 +5606,7 @@ Private.event_prototypes = { timedrequired = true, progressType = "timed" }, - --[[ + --[==[ ["Spell Cast Succeeded"] = { type = "event", events = function(trigger) @@ -5616,11 +5616,13 @@ Private.event_prototypes = { return result end, init = function(trigger) - local ret = + local ret = [[ + local _, rankId = GetSpellInfo(%d) local spellRank = %d - local rank = tonumber(spellRank:match("Rank (%d+)")) or nil - ; - return ret:format(trigger.spellRank or nil); + rankId = (rankId and tonumber(rankId:match("Rank (%d+)"))) or 0 + local rank = (spellRank and tonumber(spellRank:match("Rank (%d+)"))) or 0 + ]]; + return ret:format(trigger.spellId or 0, trigger.spellRank or nil); end, name = L["Spell Cast Succeeded"], statesParameter = "unit", @@ -5656,9 +5658,9 @@ Private.event_prototypes = { name = "spellRank", hidden = true, init = "arg", - type = "string", + type = "number", store = true, - test = "true" + test = "true", }, { name = "rank", @@ -5672,17 +5674,33 @@ Private.event_prototypes = { limit = 2 }, }, + { + name = "spellId", + display = L["Exact Spell ID(s)"], + type = "spell", + init = "spellNames", + store = true, + multiEntry = { + operator = "preamble", + preambleAdd = "spellChecker:AddName(%q)" + }, + preamble = "local spellChecker = Private.ExecEnv.CreateSpellChecker()", + preambleGroup = "spell", + test = "spellChecker:Check(spellId)", + conditionType = "number", + noProgressSource = true + }, { name = "icon", hidden = true, - init = "GetSpellIcon(spellNames or 0)", + init = "GetSpellInfo(spellId or spellNames or 0)", store = true, test = "true" }, { name = "name", hidden = true, - init = "GetSpellInfo(spellNames or 0)", + init = "GetSpellInfo(spellId or spellNames or 0)", store = true, test = "true" }, @@ -5692,7 +5710,7 @@ Private.event_prototypes = { timedrequired = true, progressType = "timed" }, - ]] + ]==] ["Ready Check"] = { type = "event", events = { diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua index 030caa3..c1b0dfe 100644 --- a/WeakAuras/Types.lua +++ b/WeakAuras/Types.lua @@ -3287,82 +3287,82 @@ do DEATHKNIGHT = { icon = "Interface\\Icons\\Spell_Deathknight_ClassIcon", specs = { - Unholy = "Interface\\Icons\\Spell_Deathknight_UnholyPresence", - Frost = "Interface\\Icons\\Spell_Deathknight_FrostPresence", - Blood = "Interface\\Icons\\Spell_Deathknight_BloodPresence", + [L["Unholy"]] = "Interface\\Icons\\Spell_Deathknight_UnholyPresence", + [L["Frost"]] = "Interface\\Icons\\Spell_Deathknight_FrostPresence", + [L["Blood"]] = "Interface\\Icons\\Spell_Deathknight_BloodPresence", } }, DRUID = { icon = "Interface\\Icons\\Ability_Druid_Maul", specs = { - Balance = "Interface\\Icons\\Spell_Nature_StarFall", - Restoration = "Interface\\Icons\\Spell_Nature_HealingTouch", - ["Feral Combat"] = "Interface\\Icons\\Ability_Racial_BearForm", - Guardian = "Interface\\Icons\\Ability_Racial_BearForm", + [L["Balance"]] = "Interface\\Icons\\Spell_Nature_StarFall", + [L["Restoration"]] = "Interface\\Icons\\Spell_Nature_HealingTouch", + [L["Feral Combat"]] = "Interface\\Icons\\Ability_Racial_BearForm", + [L["Guardian"]] = "Interface\\Icons\\Ability_Racial_BearForm", } }, HUNTER = { icon = "Interface\\Icons\\INV_Weapon_Bow_07", specs = { - Marksmanship = "Interface\\Icons\\Ability_Marksmanship", - ["Beast Mastery"] = "Interface\\Icons\\Ability_Hunter_BeastTaming", - Survival = "Interface\\Icons\\Ability_Hunter_SwiftStrike", + [L["Marksmanship"]] = "Interface\\Icons\\Ability_Marksmanship", + [L["Beast Mastery"]] = "Interface\\Icons\\Ability_Hunter_BeastTaming", + [L["Survival"]] = "Interface\\Icons\\Ability_Hunter_SwiftStrike", } }, MAGE = { icon = "Interface\\Icons\\INV_Staff_13", specs = { - Fire = "Interface\\Icons\\Spell_Fire_FireBolt02", - Frost = "Interface\\Icons\\Spell_Frost_FrostBolt02", - Arcane = "Interface\\Icons\\Spell_Holy_MagicalSentry", + [L["Fire"]] = "Interface\\Icons\\Spell_Fire_FireBolt02", + [L["Frost"]] = "Interface\\Icons\\Spell_Frost_FrostBolt02", + [L["Arcane"]] = "Interface\\Icons\\Spell_Holy_MagicalSentry", } }, PALADIN = { icon = "Interface\\Icons\\INV_Hammer_01", specs = { - Protection = "Interface\\Icons\\Spell_Holy_DevotionAura", - Holy = "Interface\\Icons\\Spell_Holy_HolyBolt", - Retribution = "Interface\\Icons\\Spell_Holy_AuraOfLight", + [L["Protection"]] = "Interface\\Icons\\Spell_Holy_DevotionAura", + [L["Holy"]] = "Interface\\Icons\\Spell_Holy_HolyBolt", + [L["Retribution"]] = "Interface\\Icons\\Spell_Holy_AuraOfLight", } }, PRIEST = { icon = "Interface\\Icons\\INV_Staff_30", specs = { - Discipline = "Interface\\Icons\\Spell_Holy_WordFortitude", - Holy = "Interface\\Icons\\Spell_Holy_GuardianSpirit", - Shadow = "Interface\\Icons\\Spell_Shadow_ShadowWordPain", + [L["Discipline"]] = "Interface\\Icons\\Spell_Holy_WordFortitude", + [L["Holy"]] = "Interface\\Icons\\Spell_Holy_GuardianSpirit", + [L["Shadow"]] = "Interface\\Icons\\Spell_Shadow_ShadowWordPain", } }, ROGUE = { icon = "Interface\\Icons\\INV_ThrowingKnife_04", specs = { - Subtlety = "Interface\\Icons\\Ability_Stealth", - Combat = "Interface\\Icons\\Ability_BackStab", - Assassination = "Interface\\Icons\\Ability_Rogue_Eviscerate", + [L["Subtlety"]] = "Interface\\Icons\\Ability_Stealth", + [L["Combat"]] = "Interface\\Icons\\Ability_BackStab", + [L["Assassination"]] = "Interface\\Icons\\Ability_Rogue_Eviscerate", } }, SHAMAN = { icon = "Interface\\Icons\\Spell_Nature_BloodLust", specs = { - Enhancement = "Interface\\Icons\\Spell_Nature_LightningShield", - Elemental = "Interface\\Icons\\Spell_Nature_Lightning", - Restoration = "Interface\\Icons\\Spell_Nature_MagicImmunity", + [L["Enhancement"]] = "Interface\\Icons\\Spell_Nature_LightningShield", + [L["Elemental"]] = "Interface\\Icons\\Spell_Nature_Lightning", + [L["Restoration"]] = "Interface\\Icons\\Spell_Nature_MagicImmunity", } }, WARLOCK = { icon = "Interface\\Icons\\Spell_Nature_FaerieFire", specs = { - Demonology = "Interface\\Icons\\Spell_Shadow_Metamorphosis", - Affliction = "Interface\\Icons\\Spell_Shadow_DeathCoil", - Destruction = "Interface\\Icons\\Spell_Shadow_RainOfFire", + [L["Demonology"]] = "Interface\\Icons\\Spell_Shadow_Metamorphosis", + [L["Affliction"]] = "Interface\\Icons\\Spell_Shadow_DeathCoil", + [L["Destruction"]] = "Interface\\Icons\\Spell_Shadow_RainOfFire", } }, WARRIOR = { icon = "Interface\\Icons\\INV_Sword_27", specs = { - Arms = "Interface\\Icons\\Ability_Rogue_Eviscerate", - Protection = "Interface\\Icons\\INV_Shield_06", - Fury = "Interface\\Icons\\Ability_Warrior_InnerRage", + [L["Arms"]] = "Interface\\Icons\\Ability_Rogue_Eviscerate", + [L["Protection"]] = "Interface\\Icons\\INV_Shield_06", + [L["Fury"]] = "Interface\\Icons\\Ability_Warrior_InnerRage", } }, }