Skip to content

Commit 75d6da9

Browse files
github-actions[bot]LocalIdentityLocalIdentity
authored
[pob1-port] Fix Overexertion and Echoes of Creation counting duplicate Warcries (#1587)
* Apply changes from PathOfBuildingCommunity/PathOfBuilding#9144 * Fix conflict * Update to use multiplier --------- Co-authored-by: LocalIdentity <LocalIdentity@users.noreply.github.com> Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 860d03e commit 75d6da9

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/Modules/CalcOffence.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2986,7 +2986,7 @@ function calcs.offence(env, actor, activeSkill)
29862986

29872987
-- Exerted Attack members
29882988
local exertedDoubleDamage = env.modDB:Sum("BASE", cfg, "ExertDoubleDamageChance")
2989-
local exertingWarcryCount = env.modDB:Sum("BASE", nil, "ExertingWarcryCount")
2989+
local exertingWarcryCount = env.modDB:Sum("BASE", nil, "Multiplier:ExertingWarcryCount")
29902990
globalOutput.OffensiveWarcryEffect = 1
29912991
globalOutput.MaxOffensiveWarcryEffect = 1
29922992
globalOutput.TheoreticalOffensiveWarcryEffect = 1

src/Modules/CalcPerform.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1724,6 +1724,7 @@ function calcs.perform(env, skipEHP)
17241724
end
17251725

17261726
local appliedCombustion = false
1727+
local warcryList = { }
17271728
for _, activeSkill in ipairs(env.player.activeSkillList) do
17281729
local skillFlags
17291730
if env.mode == "CALCS" then
@@ -1793,7 +1794,10 @@ function calcs.perform(env, skipEHP)
17931794
local extraExertions = modStore:Sum("BASE", nil, "ExtraExertedAttacks") or 0
17941795
local exertMultiplier = modStore:More(nil, "ExtraExertedAttacks")
17951796
env.player.modDB:NewMod("Num"..warcryName.."Exerts", "BASE", m_floor((baseExerts + extraExertions) * exertMultiplier))
1796-
env.player.modDB:NewMod("ExertingWarcryCount", "BASE", 1)
1797+
if not warcryList[buff.name] then
1798+
env.player.modDB:NewMod("Multiplier:ExertingWarcryCount", "BASE", 1, buff.name)
1799+
warcryList[buff.name] = true
1800+
end
17971801
end
17981802
if not activeSkill.skillModList:Flag(nil, "CannotShareWarcryBuffs") then
17991803
local warcryPower = modDB:Override(nil, "WarcryPower") or m_max((modDB:Sum("BASE", nil, "WarcryPower") or 0) * (1 + (modDB:Sum("INC", nil, "WarcryPower") or 0)/100), (modDB:Sum("BASE", nil, "MinimumWarcryPower") or 0))

0 commit comments

Comments
 (0)