diff --git a/MikScrollingBattleText/Libs/BabbleSpell-2.2/Babble-Spell-2.2.lua b/MikScrollingBattleText/Libs/BabbleSpell-2.2/Babble-Spell-2.2.lua index 35dfe18..eb8568d 100644 --- a/MikScrollingBattleText/Libs/BabbleSpell-2.2/Babble-Spell-2.2.lua +++ b/MikScrollingBattleText/Libs/BabbleSpell-2.2/Babble-Spell-2.2.lua @@ -10,7 +10,7 @@ Dependencies: AceLibrary, AceLocale-2.2 ]] local MAJOR_VERSION = "Babble-Spell-2.2" -local MINOR_VERSION = tonumber(string.sub("$Revision: 15060 $", 12, -3)) +local MINOR_VERSION = tonumber(string.sub("$Revision: 15059 $", 12, -3)) if not AceLibrary then error(MAJOR_VERSION .. " requires AceLibrary") end if not AceLibrary:HasInstance("AceLocale-2.2") then error(MAJOR_VERSION .. " requires AceLocale-2.2") end @@ -423,7 +423,6 @@ BabbleSpell:RegisterTranslations("enUS", function() ["Gun Specialization"] = true, ["Guns"] = true, ["Hammer of Justice"] = true, - ["Hand of Justice"] = true, ["Hammer of Wrath"] = true, ["Hamstring"] = true, ["Harass"] = true, @@ -1458,7 +1457,6 @@ BabbleSpell:RegisterTranslations("deDE", function() ["Gun Specialization"] = "Schusswaffenspezialisierung", ["Guns"] = "Schusswaffen", ["Hammer of Justice"] = "Hammer der Gerechtigkeit", - ["Hand of Justice"] = "Hand der Gerechtigkeit", ["Hammer of Wrath"] = "Hammer des Zorns", ["Hamstring"] = "Kniesehne", ["Harass"] = "Bel\195\164stigen", @@ -2475,7 +2473,6 @@ BabbleSpell:RegisterTranslations("frFR", function() ["Gun Specialization"] = "Sp\195\169cialisation Armes \195\160 feu", ["Guns"] = "Armes \195\160 feu", ["Hammer of Justice"] = "Marteau de la justice", - ["Hand of Justice"] = "Main de justice", ["Hammer of Wrath"] = "Marteau de courroux", ["Hamstring"] = "Brise-genou", ["Harass"] = "Harc\195\168lement", @@ -2814,8 +2811,8 @@ BabbleSpell:RegisterTranslations("frFR", function() ["Polearm Specialization"] = "Sp\195\169cialisation Arme d'hast", ["Polearms"] = "Armes d'hast", ["Polymorph"] = "M\195\169tamorphose", - ["Polymorph: Pig"] = "M\195\169tamorphose: cochon", - ["Polymorph: Turtle"] = "M\195\169tamorphose: Tortue", -- all other polymorph spells don't have a capital letter before the animal name, to test + ["Polymorph: Pig"] = "Métamorphose : cochon", + ["Polymorph: Turtle"] = "M\195\169tamorphose : tortue", -- all other polymorph spells don't have a capital letter before the animal name, to test ["Portal: Darnassus"] = "Portail : Darnassus", ["Portal: Ironforge"] = "Portail : Ironforge", ["Portal: Orgrimmar"] = "Portail : Orgrimmar", @@ -3491,7 +3488,6 @@ local spellIcons = { ["Gun Specialization"] = "INV_Musket_03", ["Guns"] = "INV_Weapon_Rifle_01", ["Hammer of Justice"] = "Spell_Holy_SealOfMight", - ["Hand of Justice"] = "INV_Jewelry_Talisman_01", ["Hammer of Wrath"] = "Ability_ThunderClap", ["Hamstring"] = "Ability_ShockWave", ["Harass"] = "Ability_Hunter_Harass", diff --git a/MikScrollingBattleText/MikScrollingBattleText.lua b/MikScrollingBattleText/MikScrollingBattleText.lua index 0638a20..1db2f77 100644 --- a/MikScrollingBattleText/MikScrollingBattleText.lua +++ b/MikScrollingBattleText/MikScrollingBattleText.lua @@ -94,8 +94,7 @@ ICON_CACHE["restauration du mana"] = "Interface\\Icons\\inv_potion_76" ICON_CACHE["rune démoniaque"] = "Interface\\Icons\\inv_misc_rune_04" ICON_CACHE["rune ténébreuse"] = "Interface\\Icons\\spell_shadow_sealofkings" ICON_CACHE["absorption de magie"] = "Interface\\Icons\\spell_nature_astralrecalgroup" -ICON_CACHE["gel"] = "Interface\\Icons\\spell_frost_glacier" - +ICON_CACHE["gel"] = "Interface\\Icons\\spell_frost_glacier" ICON_CACHE["lésions cérébrales"] = "Interface\\Icons\\ability_gouge" ICON_CACHE["décharge électrique"] = "Interface\\Icons\\spell_lightning_lightningbolt01" ICON_CACHE["foudre"] = "Interface\\Icons\\spell_lightning_lightningbolt01" @@ -105,13 +104,13 @@ ICON_CACHE["pierre de soins mineure"] = "Interface\\Icons\\inv_stone_04" ICON_CACHE["pierre de soins inférieure"] = "Interface\\Icons\\inv_stone_04" ICON_CACHE["pierre de soins majeure"] = "Interface\\Icons\\inv_stone_04" ICON_CACHE["pierre de soins"] = "Interface\\Icons\\inv_stone_04" -ICON_CACHE["capturer un esprit"] = "Interface\\Icons\\Spell_Shadow_Haunting" +ICON_CACHE["capturer un esprit"] = "Interface\\Icons\\Spell_Shadow_Haunting" -- Cache des spells dont l'icone n'a pas été trouvée NO_ICON_CACHE = {} --- Babble-Spell pour les icones des spells de class +-- Babble-Spell pour les icones des spells de classe local BS = AceLibrary("Babble-Spell-2.2") -- Number of font strings. @@ -1144,12 +1143,13 @@ end function MikSBT.UpdateProfiles() -- Loop through all the profiles. for _, profile in MikSBT_Save.Profiles do - -- Check if the profile was created prior to version 2.0. + if not profile.CreationVersion then -- There is an error in this Profile, we need to reset it. MikSBT.ResetProfile(profile); end + -- Check if the profile was created prior to version 2.0. if (profile.CreationVersion < 2.0) then -- Update the profile's structure. profile.ShowOverheals = MikSBT.DEFAULT_CONFIG.ShowOverheals; @@ -1232,6 +1232,16 @@ function MikSBT.UpdateProfiles() profile.CreationVersion = 4.0; end + -- Check if the profile was created prior to version 4.1. + if (profile.CreationVersion < 4.1) then + + if profile.Triggers.MSBT_TRIGGER_WINDFURY then + profile.Triggers.MSBT_TRIGGER_WINDFURY.TriggerSettings.SearchPatterns[1] = string.format(AURAADDEDSELFHELPFUL, string.gsub(BS["Windfury Totem"], "-", "%%-")) + end + + profile.CreationVersion = 4.1; + end + end end diff --git a/MikScrollingBattleText/MikScrollingBattleText.toc b/MikScrollingBattleText/MikScrollingBattleText.toc index e780d18..dd281b9 100644 --- a/MikScrollingBattleText/MikScrollingBattleText.toc +++ b/MikScrollingBattleText/MikScrollingBattleText.toc @@ -1,5 +1,5 @@ ## Interface: 11200 -## Version: 3.9 +## Version: 4.1 ## Title: Mik's Scrolling Battle Text ## Notes: Scrolls battle information around the character model. ## OptionalDeps: SW_FixLogStrings diff --git a/MikScrollingBattleText/localization.lua b/MikScrollingBattleText/localization.lua index 42dc9cc..2685fa9 100644 --- a/MikScrollingBattleText/localization.lua +++ b/MikScrollingBattleText/localization.lua @@ -12,8 +12,8 @@ MikSBT = {}; ------------------------------------------------------------------------------- MikSBT.MOD_NAME = "MikScrollingBattleText" -MikSBT.VERSION_NUMBER = 4; -MikSBT.VERSION_STRING = "v4.0"; +MikSBT.VERSION_NUMBER = 4.1; +MikSBT.VERSION_STRING = "v4.1"; MikSBT.WINDOW_TITLE = "Mik's Scrolling Battle Text " .. MikSBT.VERSION_STRING .. " - \124cffF58CBA\124hAthene Edit\124h\124r"; MikSBT.COMMAND = "/msbt"; @@ -1017,27 +1017,10 @@ MikSBT.DEFAULT_CONFIG = { TriggerSettings = { TriggerType = 6, TriggerEvents = {"CHAT_MSG_SPELL_PERIODIC_SELF_BUFFS"}, - SearchPatterns = {string.format(SPELLEXTRAATTACKSSELF, 1, BS["Windfury Weapon"])}, --"Vous gagnez %d attaques supplémentaires grâce à Arme Furie-des-vents" + SearchPatterns = {string.format(AURAADDEDSELFHELPFUL, string.gsub(BS["Windfury Totem"], "-", "%%-"))}, --"Vous gagnez Totem Furie-des-vents" -- escape char ! }, Texture = "Interface\\Icons\\spell_nature_cyclone" }, - MSBT_TRIGGER_HAND_OF_JUSTICE = { - EventSettings = { - Show = true, - Message = BS["Hand of Justice"].."!", - IsSticky = true, - FontSettings = { - Color = {r=1, g=1, b=0}, - Normal = {FontIndex=0, OutlineIndex=0, FontSize=26}, - }, - }, - TriggerSettings = { - TriggerType = 6, - TriggerEvents = {"CHAT_MSG_SPELL_SELF_BUFF"}, - SearchPatterns = {string.format(SPELLEXTRAATTACKSSELF, 1, BS["Hand of Justice"])}, --"Vous gagnez %d attaques supplémentaires grâce à Main de justice" - }, - Texture = "Interface\\Icons\\inv_jewelry_talisman_01" - }, MSBT_TRIGGER_NIGHTFALL = { EventSettings = { Show = true, diff --git a/MikScrollingBattleTextOptions/MikScrollingBattleTextOptions.toc b/MikScrollingBattleTextOptions/MikScrollingBattleTextOptions.toc index 0cd1f75..b82f604 100644 --- a/MikScrollingBattleTextOptions/MikScrollingBattleTextOptions.toc +++ b/MikScrollingBattleTextOptions/MikScrollingBattleTextOptions.toc @@ -1,5 +1,5 @@ ## Interface: 11200 -## Version: 3.9 +## Version: 4.1 ## Title: Mik's Scrolling Battle Text Options ## Notes: Load on demand options for Mik's Scrolling Battle Text ## Dependencies: MikScrollingBattleText