From e52898b5d9a909a9ebebdb4aad5fc0c9c6c4aa14 Mon Sep 17 00:00:00 2001 From: Lilylicious Date: Wed, 9 Aug 2023 08:24:43 +0200 Subject: [PATCH] Correctly apply warcry power overrides --- src/Modules/CalcPerform.lua | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua index 22e7e16738..8ff0e90a7a 100644 --- a/src/Modules/CalcPerform.lua +++ b/src/Modules/CalcPerform.lua @@ -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 @@ -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")