Skip to content

Fix Cruelty applying to Totem, Trap and Mine skills #10385

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

Open
lemmertz wants to merge 1 commit into
base: dev
Choose a base branch
from
+18 −2
Open

Fix Cruelty applying to Totem, Trap and Mine skills #10385

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions spec/System/TestSkills_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,4 +727,17 @@ describe("TestSkills", function()
assert.are.equals("SupportBarrage", barrage.grantedEffect.id)
assert.are.equals(20, barrage.level)
end)

it("does not grant Cruelty to Totem, Trap or Mine skills", function()
build.skillsTab:PasteSocketGroup("Cold Snap 20/0 1\nCruelty 20/0 1")
runCallback("OnFrame")
assert.are.equals(40, build.calcsTab.mainEnv.player.modDB.multipliers["Cruelty"])

for _, proxySupport in ipairs({ "Spell Totem", "Trap", "Blastchain Mine" }) do
newBuild()
build.skillsTab:PasteSocketGroup("Cold Snap 20/0 1\nCruelty 20/0 1\n"..proxySupport.." 20/0 1")
runCallback("OnFrame")
assert.is_nil(build.calcsTab.mainEnv.player.modDB.multipliers["Cruelty"])
end
end)
end)
4 changes: 3 additions & 1 deletion src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,9 @@ local function doActorMisc(env, actor)

-- Add misc buffs/debuffs
if env.mode_combat then
if env.player.mainSkill.baseSkillModList:Flag(nil, "Cruelty") then
-- Totems, Traps and Mines cannot gain or grant Cruelty
local mainSkillFlags = env.player.mainSkill.skillFlags
if env.player.mainSkill.baseSkillModList:Flag(nil, "Cruelty") and not mainSkillFlags.totem and not mainSkillFlags.trap and not mainSkillFlags.mine then
modDB.multipliers["Cruelty"] = modDB:Override(nil, "Cruelty") or 40
end
-- Minimum Rage
Expand Down
3 changes: 2 additions & 1 deletion src/Modules/Calcs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,8 @@ function calcs.buildOutput(build, mode)
if build.calcsTab.mainEnv.multipliersUsed["SpiritInfusion"] then
t_insert(combatList, s_format("%d Spirit Infusions", output.SpiritInfusions))
end
if env.player.mainSkill.baseSkillModList:Flag(nil, "Cruelty") then
local mainSkillFlags = env.player.mainSkill.skillFlags
if env.player.mainSkill.baseSkillModList:Flag(nil, "Cruelty") and not mainSkillFlags.totem and not mainSkillFlags.trap and not mainSkillFlags.mine then
t_insert(combatList, "Cruelty")
end
if env.modDB:Flag(nil, "Fortify") then
Expand Down