Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Battlemage's Cry and Redblade Banner not working correctly #6301

Merged
merged 1 commit into from
Aug 13, 2023
Merged

Fix Battlemage's Cry and Redblade Banner not working correctly #6301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,19 +921,11 @@ local function doActorMisc(env, actor)
if modDB:Flag(nil, "UseGhostShrouds") then
output.GhostShrouds = modDB:Override(nil, "GhostShrouds") or 3
end
if modDB:Flag(nil, "CryWolfMinimumPower") and modDB:Sum("BASE", nil, "WarcryPower") < 10 then
modDB:NewMod("WarcryPower", "OVERRIDE", 10, "Minimum Warcry Power from CryWolf")
end
if modDB:Flag(nil, "WarcryInfinitePower") then
modDB:NewMod("WarcryPower", "OVERRIDE", 999999, "Warcries have infinite power")
end
output.BloodCharges = m_min(modDB:Override(nil, "BloodCharges") or output.BloodChargesMax, output.BloodChargesMax)
output.SpiritCharges = m_min(modDB:Override(nil, "SpiritCharges") or 0, output.SpiritChargesMax)

output.WarcryPower = modDB:Override(nil, "WarcryPower") or modDB:Sum("BASE", nil, "WarcryPower") or 0
output.CrabBarriers = m_min(modDB:Override(nil, "CrabBarriers") or output.CrabBarriersMax, output.CrabBarriersMax)
output.TotalCharges = output.PowerCharges + output.FrenzyCharges + output.EnduranceCharges
modDB.multipliers["WarcryPower"] = output.WarcryPower
modDB.multipliers["PowerCharge"] = output.PowerCharges
modDB.multipliers["PowerChargeMax"] = output.PowerChargesMax
modDB.multipliers["RemovablePowerCharge"] = output.RemovablePowerCharges
Expand Down Expand Up @@ -1322,6 +1314,16 @@ function calcs.perform(env, avoidCache, fullDPSSkipEHP)

local hasGuaranteedBonechill = false


if modDB:Flag(nil, "CryWolfMinimumPower") and modDB:Sum("BASE", nil, "WarcryPower") < 10 then
modDB:NewMod("WarcryPower", "OVERRIDE", 10, "Minimum Warcry Power from CryWolf")
end
if modDB:Flag(nil, "WarcryInfinitePower") then
modDB:NewMod("WarcryPower", "OVERRIDE", 999999, "Warcries have infinite power")
end
output.WarcryPower = modDB:Override(nil, "WarcryPower") or modDB:Sum("BASE", nil, "WarcryPower") or 0
modDB.multipliers["WarcryPower"] = output.WarcryPower

for _, activeSkill in ipairs(env.player.activeSkillList) do
if activeSkill.skillFlags.brand then
local attachLimit = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "BrandsAttachedLimit")
Expand Down
Loading