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

Pet income Hotfix

Browse Source
This commit is contained in:
Athene
2015-10-17 23:13:33 +02:00
parent 4093373147
commit 8a6421355b
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MikScrollingBattleText/MikScrollingBattleText.lua
+3 -3
View File
@@ -737,8 +737,8 @@ function MikSBT.MergeEvents(mergeData, numEvents)
-- If the events have an amount then total them.
if (animationEvent.Amount ~= nil and mergeData.UnmergedEvents[x].Amount ~= nil) then
animationEvent.Amount = tonumber (animationEvent.Amount, 10)
if animationEvent.Amount and mergeData.UnmergedEvents[x].Amount then
animationEvent.Amount = tonumber(animationEvent.Amount, 10)
if animationEvent.Amount and type(animationEvent.Amount) == "number" and mergeData.UnmergedEvents[x].Amount then
animationEvent.Amount = animationEvent.Amount + mergeData.UnmergedEvents[x].Amount;
end
-- animationEvent.Amount = animationEvent.Amount + mergeData.UnmergedEvents[x].Amount;
@@ -793,7 +793,7 @@ function MikSBT.MergeEvents(mergeData, numEvents)
-- Check if there were any events merged.
if (animationEvent.NumMerged > 0) then
-- Create trailer text with the number of merged events.
local trailerText = " [" .. animationEvent.NumMerged + 1 .. " " .. MikSBT.MSG_HITS;
local trailerText = " [" .. 1 + animationEvent.NumMerged.. " " .. MikSBT.MSG_HITS;
-- Check if there were any crits merged.
if (animationEvent.NumCrits > 1) then