brues/Vanilla_MikScrollingBattleText
1
0
Fork 0
mirror of https://github.com/brues-code/Vanilla_MikScrollingBattleText.git synced 2026-10-25 22:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Jrc13245
2026-04-06 13:50:29 -04:00
parent 52f87d3af8
commit c6e246c134
6 changed files with 188 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MikScrollingBattleText/Libs/BabbleSpell-2.2/Babble-Spell-2.2.lua
+28 -12
View File
@@ -45,6 +45,7 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Amplify Damage"] = true,
["Amplify Flames"] = true,
["Amplify Magic"] = true,
["Ancient Accord"] = true,
["Ancestral Fortitude"] = true,
["Ancestral Healing"] = true,
["Ancestral Knowledge"] = true,
@@ -314,6 +315,7 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Dagger Specialization"] = true,
["Daggers"] = true,
["Dampen Magic"] = true,
["Dark Harvest"] = true,
["Dark Iron Bomb"] = true,
["Dark Offering"] = true,
["Dark Pact"] = true,
@@ -330,7 +332,7 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Death Wish"] = true,
["Deep Sleep"] = true,
["Deep Slumber"] = true,
["Deep Wounds"] = true,
["Deep Wound"] = true,
["Defense"] = true,
["Defensive Stance Passive"] = true,
["Defensive Stance"] = true,
@@ -531,6 +533,7 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Flamestrike"] = true,
["Flamethrower"] = true,
["Flametongue Totem"] = true,
["Flametongue Attack"] = true,
["Flametongue Weapon"] = true,
["Flare"] = true,
["Flash Bomb"] = true,
@@ -928,12 +931,14 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Mangle (Cat)"] = true,
["Mangle"] = true,
["Mark of Arlokk"] = true,
["Mark for Death"] = true,
["Mark of the Wild"] = true,
["Martyrdom"] = true,
["Mass Dispel"] = true,
["Master Demonologist"] = true,
["Master of Deception"] = true,
["Master of Elements"] = true,
["Master Strike"] = true,
["Master Summoner"] = true,
["Maul"] = true,
["Mechanostrider Piloting"] = true,
@@ -955,6 +960,7 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Mind-numbing Poison III"] = true,
["Mind-numbing Poison"] = true,
["Mining"] = true,
["Mirror Magic"] = true,
["Misdirection"] = true,
["Mocking Blow"] = true,
["Molten Armor"] = true,
@@ -1187,6 +1193,7 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Shadow Bolt"] = true,
["Shadow Focus"] = true,
["Shadow Mastery"] = true,
["Shadow of Death"] = true,
["Shadow Protection"] = true,
["Shadow Reach"] = true,
["Shadow Resistance Aura"] = true,
@@ -1284,7 +1291,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,
@@ -1305,6 +1312,7 @@ BabbleSpell:RegisterTranslations("enUS", function()
["Sunder Armor"] = true,
["Suppression"] = true,
["Surefooted"] = true,
["Surprise Attack"] = true,
["Survivalist"] = true,
["Sweeping Slam"] = true,
["Sweeping Strikes"] = true,
@@ -1771,7 +1779,7 @@ BabbleSpell:RegisterTranslations("ruRU", function()
["Death Wish"] = "Жажда смерти",
["Deep Sleep"] = "Глубокий сон",
["Deep Slumber"] = "Глубокая дремота",
["Deep Wounds"] = "Глубокие раны",
["Deep Wound"] = "Глубокие раны",
["Defense"] = "Защита",
["Defensive Stance Passive"] = "Оборонительная стойка - пассивная",
["Defensive Stance"] = "Оборонительная стойка",
@@ -3174,7 +3182,7 @@ BabbleSpell:RegisterTranslations("deDE", function()
["Death Wish"] = "Todeswunsch",
["Deep Sleep"] = "Tiefer Schlaf",
["Deep Slumber"] = "Tiefer Schlummer",
["Deep Wounds"] = "Tiefe Wunden",
["Deep Wound"] = "Tiefe Wunden",
["Defense"] = "Verteidigung",
["Defensive Stance Passive"] = "Verteidigungshaltung - Passiv",
["Defensive Stance"] = "Verteidigungshaltung",
@@ -4512,7 +4520,7 @@ BabbleSpell:RegisterTranslations("frFR", function()
["Deadly Throw"] = "Deadly Throw", -- Need to translated
["Death Coil"] = "Voile mortel",
["Death Wish"] = "Souhait mortel",
["Deep Wounds"] = "Blessures profondes",
["Deep Wound"] = "Blessures profondes",
["Defense"] = "D\195\169fense",
["Defensive Stance Passive"] = "Posture d\195\169fensive",
["Defensive Stance"] = "Posture d\195\169fensive",
@@ -4756,6 +4764,7 @@ BabbleSpell:RegisterTranslations("frFR", function()
["Holy Shield"] = "Bouclier sacr\195\169",
["Holy Shock"] = "Horion sacr\195\169",
["Holy Specialization"] = "Sp\195\169cialisation",
["Holy Strike"] = "Frappe sacr\195\169e",
["Holy Wrath"] = "Col\195\168re divine",
["Honorless Target"] = "Cible sans honneur",
["Horse Riding"] = "Equitation",
@@ -5290,8 +5299,7 @@ BabbleSpell:RegisterTranslations("frFR", function()
["Starfire"] = "Feu stellaire",
["Starshards"] = "Eclats stellaires",
["Staves"] = "B\195\162tons",
["Steady Shot"] = "Tir stable",
["Steady Shot"] = "Steady Shot", -- Need to translated
["Steady Shot"] = "Tir stable",
["Stealth"] = "Camouflage",
["Stoneclaw Totem"] = "Totem de Griffes de pierre",
["Stoneform"] = "Forme de pierre",
@@ -5658,7 +5666,7 @@ BabbleSpell:RegisterTranslations("zhCN", function()
["Deadly Throw"] = "Deadly Throw", -- Need to translated
["Death Coil"] = "死亡缠绕",
["Death Wish"] = "死亡之愿",
["Deep Wounds"] = "重度伤口",
["Deep Wound"] = "重度伤口",
["Defense"] = "防御",
["Defensive Stance Passive"] = "防御姿态（被动）",
["Defensive Stance"] = "防御姿态",
@@ -6800,7 +6808,7 @@ BabbleSpell:RegisterTranslations("zhTW", function()
["Deadly Throw"] = "Deadly Throw", -- Need to translated
["Death Coil"] = "死亡纏繞",
["Death Wish"] = "死亡之願",
["Deep Wounds"] = "重傷",
["Deep Wound"] = "重傷",
["Defense"] = "防禦",
["Defensive Stance Passive"] = "防禦姿態（被動）",
["Defensive Stance"] = "防禦姿態",
@@ -7944,7 +7952,7 @@ BabbleSpell:RegisterTranslations("koKR", function()
["Deadly Throw"] = "Deadly Throw", -- Need to translated
["Death Coil"] = "죽음의 고리",
["Death Wish"] = "죽음의 소원",
["Deep Wounds"] = "치명상",
["Deep Wound"] = "치명상",
["Defense"] = "방어",
["Defensive Stance Passive"] = "방어 태세 지속효과",
["Defensive Stance"] = "방어 태세",
@@ -8949,6 +8957,7 @@ local spellIcons = {
["Amplify Flames"] = "Spell_Fire_Fireball",
["Amplify Magic"] = "Spell_Holy_FlashHeal",
["Ancestral Fortitude"] = "Spell_Nature_UndyingStrength",
["Ancient Accord"] = "INV_Misc_Rune_03",
["Ancestral Healing"] = "Spell_Nature_UndyingStrength",
["Ancestral Knowledge"] = "Spell_Shadow_GrimWard",
["Ancestral Spirit"] = "Spell_Nature_Regenerate",
@@ -9204,6 +9213,7 @@ local spellIcons = {
["Dark Iron Bomb"] = "Spell_Fire_SelfDestruct",
["Dark Offering"] = "Spell_Shadow_Haunting",
["Dark Pact"] = "Spell_Shadow_DarkRitual",
["Dark Harvest"] = "Spell_Shadow_SoulLeech",
["Darkness"] = "Spell_Shadow_Twilight",
["Dash"] = "Ability_Druid_Dash",
["Dazed"] = "Spell_Frost_Stun",
@@ -9216,7 +9226,7 @@ local spellIcons = {
["Death Wish"] = "Spell_Shadow_DeathPact",
["Deep Sleep"] = "Spell_Nature_Sleep",
["Deep Slumber"] = "Spell_Shadow_Cripple",
["Deep Wounds"] = "Ability_BackStab",
["Deep Wound"] = "Ability_BackStab",
["Defense"] = "Ability_Racial_ShadowMeld",
["Defensive Stance Passive"] = "Ability_Warrior_DefensiveStance",
["Defensive Stance"] = "Ability_Warrior_DefensiveStance",
@@ -9402,6 +9412,7 @@ local spellIcons = {
["Flames of Shahram"] = "Spell_Fire_SelfDestruct",
["Flamestrike"] = "Spell_Fire_SelfDestruct",
["Flamethrower"] = "Spell_Fire_Incinerate",
["Flametongue Attack"] = "Spell_Nature_GuardianWard",
["Flametongue Totem"] = "Spell_Nature_GuardianWard",
["Flametongue Weapon"] = "Spell_Fire_FlameTounge",
["Flare"] = "Spell_Fire_Flare",
@@ -9785,6 +9796,7 @@ local spellIcons = {
["Mana Spring Totem"] = "Spell_Nature_ManaRegenTotem",
["Mana Tide Totem"] = "Spell_Frost_SummonWaterElemental",
["Mangle"] = "Ability_Druid_Mangle.tga",
["Mark for Death"] = "Ability_Creature_Cursed_02",
["Mark of Arlokk"] = "Ability_Hunter_SniperShot",
["Mark of the Wild"] = "Spell_Nature_Regeneration",
["Martyrdom"] = "Spell_Nature_Tranquility",
@@ -9792,6 +9804,7 @@ local spellIcons = {
["Master Demonologist"] = "Spell_Shadow_ShadowPact",
["Master of Deception"] = "Spell_Shadow_Charm",
["Master of Elements"] = "Spell_Fire_MasterOfElements",
["Master Strike"] = "Master_Strike_1",
["Master Summoner"] = "Spell_Shadow_ImpPhaseShift",
["Maul"] = "Ability_Druid_Maul",
["Mechanostrider Piloting"] = "Spell_Nature_Swiftness",
@@ -9812,7 +9825,8 @@ local spellIcons = {
["Mind-numbing Poison II"] = "Spell_Nature_NullifyDisease",
["Mind-numbing Poison III"] = "Spell_Nature_NullifyDisease",
["Mind-numbing Poison"] = "Spell_Nature_NullifyDisease",
["Mining"] = "Spell_Fire_FlameBlades",
["Mining"] = "Trade_Mining",
["Mirror Magic"] = "Spell_Holy_DispelMagic",
["Mocking Blow"] = "Ability_Warrior_PunishingBlow",
["Molten Blast"] = "Spell_Fire_Fire",
["Molten Metal"] = "Spell_Fire_Fireball",
@@ -10033,6 +10047,7 @@ local spellIcons = {
["Shadow Bolt"] = "Spell_Shadow_ShadowBolt",
["Shadow Focus"] = "Spell_Shadow_BurningSpirit",
["Shadow Mastery"] = "Spell_Shadow_ShadeTrueSight",
["Shadow of Death"] = "Spell_Shadow_Of_Death_3B",
["Shadow Protection"] = "Spell_Shadow_AntiShadow",
["Shadow Reach"] = "Spell_Shadow_ChillTouch",
["Shadow Resistance Aura"] = "Spell_Shadow_SealOfKings",
@@ -10137,6 +10152,7 @@ local spellIcons = {
["Sunder Armor"] = "Ability_Warrior_Sunder",
["Suppression"] = "Spell_Shadow_UnsummonBuilding",
["Surefooted"] = "Ability_Kick",
["Surprise Attack"] = "Ability_Rogue_SurpriseAttack",
["Survivalist"] = "Spell_Shadow_Twilight",
["Sweeping Slam"] = "Ability_Devour",
["Sweeping Strikes"] = "Ability_Rogue_SliceDice",
MikScrollingBattleText/MikCombatEventHelper.lua
+14 -12
View File
@@ -3447,21 +3447,23 @@ end
-- parameters passed.
-- **********************************************************************************
function MikCEH.GetUnorderedCaptureDataTable(c1, c2, c3, c4, c5, c6, c7, c8, c9)
-- Erase old unorderd capture data.
MikCEH.EraseTable(unorderedCaptureData);
-- 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;
if (c1 ~= nil) then table.insert(unorderedCaptureData, c1); end
if (c2 ~= nil) then table.insert(unorderedCaptureData, c2); end
if (c3 ~= nil) then table.insert(unorderedCaptureData, c3); end
if (c4 ~= nil) then table.insert(unorderedCaptureData, c4); end
if (c5 ~= nil) then table.insert(unorderedCaptureData, c5); end
if (c6 ~= nil) then table.insert(unorderedCaptureData, c6); end
if (c7 ~= nil) then table.insert(unorderedCaptureData, c7); end
if (c8 ~= nil) then table.insert(unorderedCaptureData, c8); end
if (c9 ~= nil) then table.insert(unorderedCaptureData, c9); 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
MikScrollingBattleText/MikScrollingBattleText.lua
+32 -14
View File
@@ -113,7 +113,8 @@ ICON_CACHE["morsure fatale"] = "Interface\\Icons\\ability_backstab"
ICON_CACHE["explosion sonore"] = "Interface\\Icons\\spell_shadow_teleport"
ICON_CACHE["flammes"] = "Interface\\Icons\\spell_fire_fire"
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 = {}
@@ -1254,30 +1255,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"]);
@@ -1297,17 +1298,34 @@ 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);
profile.CreationVersion = 4.4;
end
if (profile.CreationVersion < 4.6) then
-- Add missing incoming evade/reflect event settings (needed for Nampower events).
local incomingMissEvents = {
"MSBT_EVENTTYPE_INCOMING_EVADE",
"MSBT_EVENTTYPE_INCOMING_SPELL_EVADE",
"MSBT_EVENTTYPE_INCOMING_PET_EVADE",
"MSBT_EVENTTYPE_INCOMING_PET_SPELL_EVADE",
"MSBT_EVENTTYPE_INCOMING_PET_SPELL_REFLECT",
};
for _, evtName in incomingMissEvents do
if not profile.EventSettings[evtName] and MikSBT.DEFAULT_CONFIG.EventSettings[evtName] then
profile.EventSettings[evtName] = MikSBT.CopyTable(MikSBT.DEFAULT_CONFIG.EventSettings[evtName]);
end
end
profile.CreationVersion = 4.6;
end
end
end
MikScrollingBattleText/localization.lua
+40
View File
@@ -315,6 +315,14 @@ MikSBT.DEFAULT_CONFIG = {
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_EVADE = {
Show = true,
Message = EVADE.."!",
FontSettings = {
Color = {r=1, g=1, b=0},
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_SPELL_DAMAGE = {
Show = true,
Message = "-%a",
@@ -397,6 +405,14 @@ MikSBT.DEFAULT_CONFIG = {
Crit = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_SPELL_EVADE = {
Show = true,
Message = "(%s) "..EVADE.."!",
FontSettings = {
Color = {r=1, g=1, b=0},
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_HEAL = {
Show = true,
Message = "+%a (%n)",
@@ -479,6 +495,14 @@ MikSBT.DEFAULT_CONFIG = {
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_PET_EVADE = {
Show = true,
Message = EVADE..L["! (Pet)"],
FontSettings = {
Color = {r=1, g=0.7, b=0},
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_PET_SPELL_DAMAGE = {
Show = true,
Message = L["-%a (Pet)"],
@@ -552,6 +576,22 @@ MikSBT.DEFAULT_CONFIG = {
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_PET_SPELL_EVADE = {
Show = true,
Message = "(%s) "..EVADE..L["! (Pet)"],
FontSettings = {
Color = {r=1, g=0.7, b=0},
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_PET_SPELL_REFLECT = {
Show = true,
Message = "(%s) "..REFLECT..L["! (Pet)"],
FontSettings = {
Color = {r=1, g=0.7, b=0},
Normal = {FontIndex=0, OutlineIndex=0, FontSize=0},
},
},
MSBT_EVENTTYPE_INCOMING_PET_HEAL = {
Show = true,
Message = L["+%a (%n) (Pet)"],