Skip to content

Commit

Permalink
Merge pull request #432 from itsnotapt/patch-1
Browse files Browse the repository at this point in the history
Typo "Tamage"
  • Loading branch information
Tercioo authored Jan 18, 2023
2 parents 468c0bd + 76d8b07 commit 4fe2bc0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions classes/class_damage.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1718,7 +1718,7 @@ function atributo_damage:RefreshWindow(instancia, combatObject, forcar, exportar
elseif (subAttribute == 2) then --DPS
keyName = "last_dps"

elseif (subAttribute == 3) then --TAMAGE TAKEN
elseif (subAttribute == 3) then --DAMAGE TAKEN
keyName = "damage_taken"
if (Details.damage_taken_everything) then
windowMode = modo_ALL
Expand Down Expand Up @@ -1755,7 +1755,7 @@ function atributo_damage:RefreshWindow(instancia, combatObject, forcar, exportar
elseif (subAttribute == 2) then --DPS
keyName = "last_dps"

elseif (subAttribute == 3) then --TAMAGE TAKEN
elseif (subAttribute == 3) then --DAMAGE TAKEN
keyName = "damage_taken"
if (Details.damage_taken_everything) then
windowMode = modo_ALL
Expand Down
4 changes: 2 additions & 2 deletions functions/plater.lua
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ end
plater_integration_frame:SetScript("OnEvent", function(self)
local time, token, hidding, sourceGUID, sourceName, sourceFlag, sourceFlag2, targetGUID, targetName, targetFlag, targetFlag2, spellID, spellName, spellType, amount, overKill, school, resisted, blocked, absorbed, isCritical = CombatLogGetCurrentEventInfo()

--tamage taken by the GUID unit
--damage taken by the GUID unit
if (token == "SPELL_DAMAGE" or token == "SPELL_PERIODIC_DAMAGE" or token == "RANGE_DAMAGE" or token == "DAMAGE_SHIELD") then
plater_integration_frame.AddDamageToGUID (sourceGUID, targetGUID, time, amount)

Expand Down Expand Up @@ -156,4 +156,4 @@ function Details:RefreshPlaterIntegration()



end
end
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ function EncounterDetails:OpenAndRefresh (_, segment)
barra:HookScript ("OnMouseDown", EncounterDetails.BossInfoRowClick)

local add_damage_done = _CreateFrame ("Button", nil, barra, "BackdropTemplate")
barra.report_text = "Details! Tamage Taken of "
barra.report_text = "Details! Damage Taken of "
add_damage_done.report_text = "Details! Damage Done of "
add_damage_done.barra = barra
add_damage_done:SetWidth (EncounterDetails.CooltipLineHeight)
Expand Down

0 comments on commit 4fe2bc0

Please sign in to comment.