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 74630fd..45d0668 100644 --- a/MikScrollingBattleText/Libs/BabbleSpell-2.2/Babble-Spell-2.2.lua +++ b/MikScrollingBattleText/Libs/BabbleSpell-2.2/Babble-Spell-2.2.lua @@ -534,6 +534,7 @@ BabbleSpell:RegisterTranslations("enUS", function() ["Flamethrower"] = true, ["Flametongue Attack"] = true, ["Flametongue Totem"] = true, + ["Flametongue Attack"] = true, ["Flametongue Weapon"] = true, ["Flare"] = true, ["Flash Bomb"] = true, @@ -932,6 +933,7 @@ BabbleSpell:RegisterTranslations("enUS", function() ["Mangle"] = true, ["Mark for Death"] = true, ["Mark of Arlokk"] = true, + ["Mark for Death"] = true, ["Mark of the Wild"] = true, ["Martyrdom"] = true, ["Mass Dispel"] = true, @@ -1291,7 +1293,7 @@ BabbleSpell:RegisterTranslations("enUS", function() ["Stoneclaw Totem"] = true, ["Stoneform"] = true, ["Stoneskin Totem"] = true, - ["Stormstrike"] = true, +-- ["Stormstrike"] = true, ["Strength of Earth Totem"] = true, ["Strike"] = true, ["Stuck"] = true, diff --git a/MikScrollingBattleText/MikCombatEventHelper.lua b/MikScrollingBattleText/MikCombatEventHelper.lua index 6ae424d..ec758e5 100644 --- a/MikScrollingBattleText/MikCombatEventHelper.lua +++ b/MikScrollingBattleText/MikCombatEventHelper.lua @@ -4421,23 +4421,23 @@ end -- parameters passed. -- ********************************************************************************** function MikCEH.GetUnorderedCaptureDataTable(c1, c2, c3, c4, c5, c6, c7, c8, c9) - -- Assign directly by index instead of EraseTable + table_insert. - unorderedCaptureData[1] = c1; - unorderedCaptureData[2] = c2; - unorderedCaptureData[3] = c3; - unorderedCaptureData[4] = c4; - unorderedCaptureData[5] = c5; - unorderedCaptureData[6] = c6; - unorderedCaptureData[7] = c7; - unorderedCaptureData[8] = c8; - unorderedCaptureData[9] = c9; + -- Assign directly by index instead of EraseTable + table_insert. + unorderedCaptureData[1] = c1; + unorderedCaptureData[2] = c2; + unorderedCaptureData[3] = c3; + unorderedCaptureData[4] = c4; + unorderedCaptureData[5] = c5; + unorderedCaptureData[6] = c6; + unorderedCaptureData[7] = c7; + unorderedCaptureData[8] = c8; + unorderedCaptureData[9] = c9; - -- Clear any leftover slots beyond 9. - local i = 10; - while unorderedCaptureData[i] do unorderedCaptureData[i] = nil; i = i + 1; end + -- Clear any leftover slots beyond 9. + local i = 10; + while unorderedCaptureData[i] do unorderedCaptureData[i] = nil; i = i + 1; end -- Return the populated unordered capture data table. - return unorderedCaptureData; + return unorderedCaptureData; end diff --git a/MikScrollingBattleText/MikScrollingBattleText.lua b/MikScrollingBattleText/MikScrollingBattleText.lua index cfc31df..a6313d7 100644 --- a/MikScrollingBattleText/MikScrollingBattleText.lua +++ b/MikScrollingBattleText/MikScrollingBattleText.lua @@ -127,7 +127,6 @@ ICON_CACHE["effet inferno"] = "Interface\\Icons\\spell_fire_incinerate" ICON_CACHE["flametongue attack"] = "Interface\\Icons\\Spell_Nature_GuardianWard" ICON_CACHE["stratholme holy water"] = "Interface\\Icons\\Inv_Potion_75" - -- Cache des spells dont l'icone n'a pas été trouvée NO_ICON_CACHE = {} @@ -1332,30 +1331,30 @@ function MikSBT.UpdateProfiles() -- Check if the profile was created prior to version 4.0. if (profile.CreationVersion < 4.0) then - + profile.ShowAllManaGains = false; profile.LowHealthSound = true; profile.LowManaSound = true; - + 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 -- Fix Windfury Trigger profile.Triggers.MSBT_TRIGGER_WINDFURY.TriggerSettings.SearchPatterns[1] = string.format(AURAADDEDSELFHELPFUL, string_gsub(BS["Windfury Totem"], "-", "%%-")) end - + if profile.Triggers.MSBT_TRIGGER_HAND_OF_JUSTICE then -- Delete Hand of Justice Trigger profile.Triggers["MSBT_TRIGGER_HAND_OF_JUSTICE"] = nil; end - + profile.CreationVersion = 4.1; end - + if (profile.CreationVersion < 4.3) then - + -- The pet update ! profile.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_DAMAGE"] = MikSBT.CopyTable(MikSBT.DEFAULT_CONFIG.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_DAMAGE"]); profile.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_MISS"] = MikSBT.CopyTable(MikSBT.DEFAULT_CONFIG.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_MISS"]); @@ -1375,10 +1374,10 @@ function MikSBT.UpdateProfiles() profile.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_SPELL_IMMUNE"] = MikSBT.CopyTable(MikSBT.DEFAULT_CONFIG.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_SPELL_IMMUNE"]); profile.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_HEAL"] = MikSBT.CopyTable(MikSBT.DEFAULT_CONFIG.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_HEAL"]); profile.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_HOT"] = MikSBT.CopyTable(MikSBT.DEFAULT_CONFIG.EventSettings["MSBT_EVENTTYPE_INCOMING_PET_HOT"]); - + profile.CreationVersion = 4.3; end - + if (profile.CreationVersion < 4.4) then profile.BlizzardFontSettings = MikSBT.CopyTable(MikSBT.DEFAULT_CONFIG.BlizzardFontSettings); diff --git a/MikScrollingBattleTextOptions/MSBTOptions.lua b/MikScrollingBattleTextOptions/MSBTOptions.lua index 30abe54..cee546f 100644 --- a/MikScrollingBattleTextOptions/MSBTOptions.lua +++ b/MikScrollingBattleTextOptions/MSBTOptions.lua @@ -3707,4 +3707,4 @@ function MikSBTOpt.PopulateProfileOptions() -- Populate the suppression settings. MikSBTOpt.PopulateSuppressionSettings(); -end \ No newline at end of file +end diff --git a/MikScrollingBattleTextOptions/localization_options.lua b/MikScrollingBattleTextOptions/localization_options.lua index 699ea87..a904271 100644 --- a/MikScrollingBattleTextOptions/localization_options.lua +++ b/MikScrollingBattleTextOptions/localization_options.lua @@ -291,4 +291,4 @@ MikSBTOpt.NOTIFICATION_EVENTS = { [15] = { Label="Experience Gains", Tooltips={ShowCheckbox="Sets whether or not to show when you gain experience points.", Editbox="%a - Amount of experience you gained."}}, [16] = { Label="Player Killing Blows", Tooltips={ShowCheckbox="Sets whether or not to show when you get a killing blow against a hostile player.", Editbox="%s - Name of the unit killed."}}, [17] = { Label="NPC Killing Blows", Tooltips={ShowCheckbox="Sets whether or not to show when you get a killing blow against an NPC.", Editbox="%s - Name of the unit killed."}}, -}; \ No newline at end of file +};