Commit 9fe82277 authored by Maiyannah Bishop's avatar Maiyannah Bishop

[Imp] Fill in hotbar buttons common to templar and DK for #236

[Imp] Fix transposition of major and minor damage in DK concat for #239
parent 0eeefae8
......@@ -696,7 +696,7 @@ function Kauna.Imperian.Hotbar.DrawButtons()
if (f6override==true) then
-- use user-supplied values
Kauna.setF6Button(f6action, f6icon, f6tooltip)
elseif (prof=="templar") then
elseif (prof=="templar" or prof=="deathknight") then
Kauna.setF6Button("Kauna.Imperian.Hotbar.F6", "btn-imp-tendoncut.png", "Kauna.Imperian.Tooltips.DisplayF6Tooltip")
elseif (prof=="berserker") then
Kauna.setF6Button("UI.Hotbar.doImpale", "btn-f6-imp-impale.png", "Kauna.Imperian.Tooltips.DisplayImpaleTooltip")
......@@ -720,7 +720,7 @@ function Kauna.Imperian.Hotbar.DrawButtons()
if (f7override==true) then
-- use user-supplied values
Kauna.setF7Button(f7action, f7icon, f7tooltip)
elseif (prof=="templar") then
elseif (prof=="templar" or prof=="deathknight") then
Kauna.setF7Button("Kauna.Imperian.Hotbar.F7", "btn-imp-lacerate", "Kauna.Imperian.Tooltips.DisplayF7Tooltip")
elseif (prof=="berserker") then
Kauna.setF7Button("UI.Hotbar.doDisembowel", "btn-f7-imp-disembowel", "Kauna.Imperian.Tooltips.DisplayDisembowelTooltip")
......@@ -769,7 +769,7 @@ function Kauna.Imperian.Hotbar.DrawButtons()
if (f9override==true) then
-- use user-supplied values
Kauna.setF9Button(f9action, f9icon, f9tooltip)
elseif (prof=="templar") then
elseif (prof=="templar" or prof=="deathknight") then
Kauna.setF9Button("Kauna.Imperian.Hotbar.F9", "btn-imp-engage", "Kauna.Imperian.Tooltips.DisplayF9Tooltip")
else
Kauna.setF9Button(f9action, f9icon, f9tooltip)
......@@ -791,7 +791,7 @@ function Kauna.Imperian.Hotbar.DrawButtons()
if (f10override==true) then
-- use user-supplied values
Kauna.setF10Button(f10action, f10icon, f10tooltip)
elseif (prof=="templar") then
elseif (prof=="templar" or prof=="deathknight") then
Kauna.setF10Button("Kauna.Imperian.Hotbar.F10", "btn-imp-impale", "Kauna.Imperian.Tooltips.DisplayF10Tooltip")
else
Kauna.setF10Button(f10action, f10icon, f10tooltip)
......@@ -1811,7 +1811,7 @@ end
message = nil
end
function Kauna.Imperian.Deathknight.ReportDSL(target1, target2, sword1, sword2, damage_dealt1, damage_dealt2, major_remaining_1, major_remaining_2, minor_remaining_1, minor_remaining_2, crit_amount_1, crit_amount_2)
function Kauna.Imperian.Deathknight.ReportDSL(target1, target2, sword1, sword2, damage_dealt1, damage_dealt2, major_remaining_1, minor_remaining_1, major_remaining_2, minor_remaining_2, crit_amount_1, crit_amount_2)
-- TODO: Hot mess of placeholder processing, clean this shite up
target = target1 or target2
damage_dealt = damage_dealt1 + damage_dealt2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment