brues/Vanilla_MikScrollingBattleText
1
0
Fork 0
mirror of https://github.com/brues-code/Vanilla_MikScrollingBattleText.git synced 2026-10-12 16:40:02 +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/MikCombatEventHelper.lua
+26 -25
View File
@@ -580,11 +580,12 @@ function MikCEH.ParseForIncomingHits(combatMessage)
return true;
end
-- Look for a normal hit on your pet
local capturedData = MikCEH.GetCapturedData(combatMessage, "COMBATHITOTHEROTHER", {"%n", "%s", "%a"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_HIT, MikCEH.HITTYPE_NORMAL, MikCEH.DAMAGETYPE_PHYSICAL, capturedData.Amount, nil, capturedData.Name);
-- Look for any partial actions and populate them into the event data.
@@ -601,7 +602,7 @@ function MikCEH.ParseForIncomingHits(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "COMBATHITCRITOTHEROTHER", {"%n", "%s", "%a"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_HIT, MikCEH.HITTYPE_CRIT, MikCEH.DAMAGETYPE_PHYSICAL, capturedData.Amount, nil, capturedData.Name);
-- Look for any partial actions and populate them into the event data.
@@ -711,7 +712,7 @@ function MikCEH.ParseForIncomingMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "MISSEDOTHEROTHER", {"%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_MISS, nil, nil, nil, nil, capturedData.Name);
-- Send the event.
@@ -725,7 +726,7 @@ function MikCEH.ParseForIncomingMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "VSDODGEOTHEROTHER", {"%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_DODGE, nil, nil, nil, nil, capturedData.Name);
-- Send the event.
@@ -739,7 +740,7 @@ function MikCEH.ParseForIncomingMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "VSPARRYOTHEROTHER", {"%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_PARRY, nil, nil, nil, nil, capturedData.Name);
-- Send the event.
@@ -753,7 +754,7 @@ function MikCEH.ParseForIncomingMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "VSBLOCKOTHEROTHER", {"%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_BLOCK, nil, nil, nil, nil, capturedData.Name);
-- Send the event.
@@ -767,7 +768,7 @@ function MikCEH.ParseForIncomingMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "VSABSORBOTHEROTHER", {"%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_ABSORB, nil, nil, nil, nil, capturedData.Name);
-- Send the event.
@@ -781,7 +782,7 @@ function MikCEH.ParseForIncomingMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "VSIMMUNEOTHEROTHER", {"%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_IMMUNE, nil, nil, nil, nil, capturedData.Name);
-- Send the event.
@@ -994,7 +995,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLLOGOTHEROTHER", {"%n", "%s", "%c", "%a"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_HIT, MikCEH.HITTYPE_NORMAL, MikCEH.DAMAGETYPE_PHYSICAL, capturedData.Amount, capturedData.SpellName, capturedData.Name);
-- Look for any partial actions and populate them into the event data.
@@ -1012,7 +1013,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLLOGCRITOTHEROTHER", {"%n", "%s", "%a"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_HIT, MikCEH.HITTYPE_CRIT, MikCEH.DAMAGETYPE_PHYSICAL, capturedData.Amount, capturedData.SpellName, capturedData.Name);
-- Look for any partial actions and populate them into the event data.
@@ -1030,7 +1031,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLLOGSCHOOLOTHEROTHER", {"%n", "%s", "%c", "%a", "%t"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_HIT, MikCEH.HITTYPE_NORMAL, capturedData.DamageType, capturedData.Amount, capturedData.SpellName, capturedData.Name);
-- Look for any partial actions and populate them into the event data.
@@ -1045,11 +1046,11 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
-- Look for a spell crit on your pet.
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLLOGCRITSCHOOLOTHERSELF", {"%n", "%s", "%a", "%t"});
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLLOGCRITSCHOOLOTHEROTHER", {"%n", "%s", "%c", "%a", "%t"});
-- If a match was found.
if (capturedData ~= nil) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PLAYER_INCOMING, MikCEH.ACTIONTYPE_HIT, MikCEH.HITTYPE_CRIT, capturedData.DamageType, capturedData.Amount, capturedData.SpellName, capturedData.Name);
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_HIT, MikCEH.HITTYPE_CRIT, capturedData.DamageType, capturedData.Amount, capturedData.SpellName, capturedData.Name);
-- Look for any partial actions and populate them into the event data.
MikCEH.ParseForPartialActions(combatMessage, eventData);
@@ -1066,7 +1067,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLMISSOTHEROTHER", {"%n", "%s", "%c"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_MISS, nil, nil, nil, capturedData.SpellName, capturedData.Name);
-- Send the event.
@@ -1081,7 +1082,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLDODGEDOTHEROTHER", {"%c", "%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_DODGE, nil, nil, nil, capturedData.SpellName, capturedData.Name);
-- Send the event.
@@ -1096,7 +1097,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLPARRIEDOTHEROTHER", {"%c", "%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_PARRY, nil, nil, nil, capturedData.SpellName, capturedData.Name);
-- Send the event.
@@ -1111,7 +1112,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLBLOCKEDOTHEROTHER", {"%c", "%s", "%n"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_BLOCK, nil, nil, nil, capturedData.SpellName, capturedData.Name);
-- Send the event.
@@ -1126,7 +1127,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLRESISTOTHEROTHER", {"%n", "%s", "%c"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_RESIST, nil, nil, nil, capturedData.SpellName, capturedData.Name);
-- Send the event.
@@ -1141,7 +1142,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLLOGABSORBOTHEROTHER", {"%n", "%s", "%c"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_ABSORB, nil, nil, nil, capturedData.SpellName, capturedData.Name);
-- Send the event.
@@ -1156,7 +1157,7 @@ function MikCEH.ParseForIncomingSpellHitsAndMisses(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "SPELLIMMUNEOTHEROTHER", {"%n", "%s", "%c"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetDamageEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.ACTIONTYPE_IMMUNE, nil, nil, nil, capturedData.SpellName, capturedData.Name);
-- Send the event.
@@ -1392,12 +1393,12 @@ function MikCEH.ParseForIncomingSpellHeals(combatMessage)
-- Return the parse was successful.
return true;
end
-- Look for a critical heal from another player / creature on your pet.
local capturedData = MikCEH.GetCapturedData(combatMessage, "HEALEDCRITOTHEROTHER", {"%n", "%s", "%c", "%a"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetHealEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.HEALTYPE_CRIT, capturedData.Amount, capturedData.SpellName, capturedData.Name);
-- Get overheal info.
@@ -1416,7 +1417,7 @@ function MikCEH.ParseForIncomingSpellHeals(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "HEALEDOTHEROTHER", {"%n", "%s", "%c", "%a"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetHealEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.HEALTYPE_NORMAL, capturedData.Amount, capturedData.SpellName, capturedData.Name);
-- Get overheal info.
@@ -1436,7 +1437,7 @@ function MikCEH.ParseForIncomingSpellHeals(combatMessage)
local capturedData = MikCEH.GetCapturedData(combatMessage, "PERIODICAURAHEALOTHEROTHER", {"%c", "%a", "%n", "%s"});
-- If a match was found.
if (capturedData ~= nil) then
if (capturedData ~= nil and UnitName("pet") and string.find(combatMessage, UnitName("pet"))) then
local eventData = MikCEH.GetHealEventData(MikCEH.DIRECTIONTYPE_PET_INCOMING, MikCEH.HEALTYPE_OVER_TIME, capturedData.Amount, capturedData.SpellName, capturedData.Name);
-- Get overheal info.
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