diff --git a/src/Modules/CalcOffence.lua b/src/Modules/CalcOffence.lua index bea7d97e17..01d89dcc13 100644 --- a/src/Modules/CalcOffence.lua +++ b/src/Modules/CalcOffence.lua @@ -1206,7 +1206,7 @@ function calcs.offence(env, actor, activeSkill) if breakdown then local inc = skillModList:Sum("INC", skillCfg, pool .. "Reserved", "Reserved", "SupportManaMultiplier") local more = skillModList:More(skillCfg, pool .. "Reserved", "Reserved", "SupportManaMultiplier") - if inc ~= 0 and more ~= 1 then + if inc ~= 0 or more ~= 1 then breakdown[pool .. "ReservedMod"] = { s_format("%.2f ^8(increased/reduced)", 1 + inc/100), s_format("x %.2f ^8(more/less)", more), diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index 9fe4527156..756334279f 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -2020,7 +2020,16 @@ function calcs.perform(env, skipEHP) if breakdown then breakdown.LifeReserved = { reservations = { } } breakdown.ManaReserved = { reservations = { } } - end + breakdown.LifeReservationEfficiency = { rowList = { }, colList = { + { label = "Skill", key = "skillName" }, + { label = "Inc/red", key = "inc" }, + { label = "More/less", key = "more" }, + { label = "Efficiency", key = "total" }, + } } + breakdown.ManaReservationEfficiency = copyTable(breakdown.LifeReservationEfficiency) + end + output.LifeReservationEfficiency = modDB:Sum("INC", nil, "LifeReservationEfficiency", "ReservationEfficiency") + output.ManaReservationEfficiency = modDB:Sum("INC", nil, "ManaReservationEfficiency", "ReservationEfficiency") for _, activeSkill in ipairs(env.player.activeSkillList) do if activeSkill.skillData.requiresManaReservation and output.Mana == 0 then activeSkill.skillFlags.disable = true @@ -2094,6 +2103,14 @@ function calcs.perform(env, skipEHP) values.reservedFlat = values.reservedFlat * (activeSkill.activeStageCount + 1) values.reservedPercent = values.reservedPercent * (activeSkill.activeStageCount + 1) end + if breakdown and (values.reservedFlat ~= 0 or values.reservedPercent ~= 0) then + t_insert(breakdown[name.."ReservationEfficiency"].rowList, { + skillName = activeSkill.activeEffect.grantedEffect.name, + inc = s_format("%+d%%", values.efficiency), + more = values.efficiencyMore ~= 1 and ("x "..values.efficiencyMore), + total = "x "..round(1 / ((1 + values.efficiency / 100) * values.efficiencyMore), 4), + }) + end if values.reservedFlat ~= 0 then activeSkill.skillData[name.."ReservedBase"] = values.reservedFlat env.player["reserved_"..name.."Base"] = env.player["reserved_"..name.."Base"] + values.reservedFlat diff --git a/src/Modules/CalcSections.lua b/src/Modules/CalcSections.lua index dbf9dfbc61..b103db1be5 100644 --- a/src/Modules/CalcSections.lua +++ b/src/Modules/CalcSections.lua @@ -1495,6 +1495,10 @@ return { { label = "Total More", { format = "{0:mod:1}%", { modName = "Life", modType = "MORE", }, }, }, { label = "Total", { format = "{0:output:Life}", { breakdown = "Life" }, }, }, { label = "Reserved", { format = "{0:output:LifeReserved} ({0:output:LifeReservedPercent}%)", { breakdown = "LifeReserved" }, }, }, + { label = "Reservation Eff.", { format = "{0:output:LifeReservationEfficiency}%", + { breakdown = "LifeReservationEfficiency" }, + { modName = { "LifeReservationEfficiency", "ReservationEfficiency" } }, + }, }, { label = "Unreserved", { format = "{0:output:LifeUnreserved} ({0:output:LifeUnreservedPercent}%)" }, }, { label = "Total Recoverable", haveOutput = "CappingLife", { format = "{0:output:LifeRecoverable}", { breakdown = "LifeUnreserved" }, }, }, { label = "Recharge Rate", haveOutput = "EnergyShieldRechargeAppliesToLife", { format = "{1:output:LifeRecharge}", @@ -1559,6 +1563,10 @@ return { { label = "Total Increased", { format = "{0:mod:1}%", { modName = "Mana", modType = "INC" }, }, }, { label = "Total", { format = "{0:output:Mana}", { breakdown = "Mana" }, }, }, { label = "Reserved", { format = "{0:output:ManaReserved} ({0:output:ManaReservedPercent}%)", { breakdown = "ManaReserved" }, }, }, + { label = "Reservation Eff.", { format = "{0:output:ManaReservationEfficiency}%", + { breakdown = "ManaReservationEfficiency" }, + { modName = { "ManaReservationEfficiency", "ReservationEfficiency" } }, + }, }, { label = "Unreserved", { format = "{0:output:ManaUnreserved} ({0:output:ManaUnreservedPercent}%)" }, }, { label = "Recovery", { format = "{1:output:ManaRegenRecovery} ({1:output:ManaRegenPercent}%)", { breakdown = "ManaRegenRecovery" },