Skip to content

Fix CWC not supporting triggerbots #8671

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

Merged
LocalIdentity merged 4 commits into from
Jun 13, 2025
Merged

Fix CWC not supporting triggerbots #8671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b275df4
FIX: CWC not supporting triggerbots
Paliak Jun 13, 2025
48c4f15
MISC(test): add triggerbot tests
Paliak Jun 13, 2025
44ffda4
FIX(breakdown): fix breakdown for trigger bots in defaultHandler
Paliak Jun 13, 2025
50ecbc9
FIX: tests
Paliak Jun 13, 2025
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
50 changes: 50 additions & 0 deletions spec/System/TestTriggers_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,4 +1359,54 @@ describe("TestTriggers", function()

assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
end)

it("Triggerbots CWCHandler", function()
build.skillsTab:PasteSocketGroup("Arc 20/0 Default 1\nCast while Channelling 20/0 Default 1\nBlight 20/0 Default 1\n")
runCallback("OnFrame")
local baseRate = build.calcsTab.mainOutput.SkillTriggerRate
assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)

build.configTab.input.customMods = [[
Triggers Level 20 Summon Triggerbots when Allocated
]]
build.configTab:BuildModList()
runCallback("OnFrame")
assert.are.not_equals(math.floor(build.calcsTab.mainOutput.SkillTriggerRate * 100), math.floor(baseRate * 100))
end)

it("Triggerbots defaultHandler", function()
build.itemsTab:CreateDisplayItemFromRaw([[Elemental 1H Sword
Eternal Sword
Crafted: true
Prefix: {range:0.5}WeaponElementalDamageOnWeapons4
Prefix: None
Prefix: None
Suffix: {range:0.5}LocalIncreasedAttackSpeed3
Suffix: {range:0.5}LocalCriticalStrikeChance3
Suffix: {range:0.5}LocalCriticalMultiplier4
Quality: 20
Sockets: G-G-G
LevelReq: 66
Implicits: 1
{tags:attack}+475 to Accuracy Rating
12% increased Attack Speed
22% increased Critical Strike Chance
+27% to Global Critical Strike Multiplier
40% increased Elemental Damage with Attack Skills]])
build.itemsTab:AddDisplayItem()
runCallback("OnFrame")

build.skillsTab:PasteSocketGroup("Cast On Critical Strike 20/0 Default 1\nArc 20/0 Default 1\nCyclone 20/0 Default 1\n")
runCallback("OnFrame")

local baseRate = build.calcsTab.mainOutput.SkillTriggerRate
assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)

build.configTab.input.customMods = [[
Triggers Level 20 Summon Triggerbots when Allocated
]]
build.configTab:BuildModList()
runCallback("OnFrame")
assert.are.not_equals(math.floor(build.calcsTab.mainOutput.SkillTriggerRate * 100), math.floor(baseRate * 100))
end)
end)
21 changes: 14 additions & 7 deletions src/Modules/CalcTriggers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@ local function CWCHandler(env)
local simBreakdown = nil
output.TriggerRateCap = m_min(1 / effCDTriggeredSkill, triggerRateOfTrigger)
output.SkillTriggerRate, simBreakdown = calcMultiSpellRotationImpact(env, triggeredSkills, triggerRateOfTrigger, 0)
local triggerBotsEffective = env.player.modDB:Flag(nil, "HaveTriggerBots") and env.player.mainSkill.skillTypes[SkillType.Spell]
if triggerBotsEffective then
output.SkillTriggerRate = 2 * output.SkillTriggerRate
end

if breakdown then
if triggeredCD or cooldownOverride then
Expand Down Expand Up @@ -331,13 +335,16 @@ local function CWCHandler(env)
t_insert(breakdown.TriggerRateCap, s_format("1 / %.3f ^8(trigger rate adjusted for triggering interval)", 1 / output.TriggerRateCap))
t_insert(breakdown.TriggerRateCap, s_format("= %.2f ^8 %s casts per second", output.TriggerRateCap, triggeredName))

-- Hide Skill Trigger Rate breakdown if there's only one skill to av
if #triggeredSkills > 1 then
breakdown.SkillTriggerRate = {
s_format("%.2f ^8(%s triggers per second)", triggerRateOfTrigger, triggerName),
s_format("/ %.2f ^8(Estimated impact of linked spells)", (triggerRateOfTrigger / output.SkillTriggerRate) or 1),
s_format("= %.2f ^8%s casts per second", output.SkillTriggerRate, triggeredName),
}

if triggerBotsEffective then
t_insert(breakdown.SkillTriggerRate, 3, "x 2 ^8(Trigger bots effectively cause the skill to trigger twice)")
end
if simBreakdown.extraSimInfo then
t_insert(breakdown.SkillTriggerRate, "")
t_insert(breakdown.SkillTriggerRate, simBreakdown.extraSimInfo)
Expand Down Expand Up @@ -809,6 +816,12 @@ local function defaultTriggerHandler(env, config)
s_format("/ %.2f ^8(Estimated impact of skill rotation, cooldown alignment and trigger chance)", m_max(output.EffectiveSourceRate / output.SkillTriggerRate, 1)),
s_format("= %.2f ^8per second", output.SkillTriggerRate),
}
if triggerBotsEffective then
t_insert(breakdown.SkillTriggerRate, 3, "x 2 ^8(Trigger bots effectively cause the skill to trigger twice)")
end
if hits_per_cast > 1 then
t_insert(breakdown.SkillTriggerRate, 3, s_format("x %.2f ^8(hits per triggered skill cast)", hits_per_cast))
end
if triggerChance ~= 100 then
t_insert(breakdown.SkillTriggerRate, 1, "")
t_insert(breakdown.SkillTriggerRate, 1, s_format("= %.2f%% ^8(Effective chance to trigger)", triggerChance))
Expand All @@ -817,12 +830,6 @@ local function defaultTriggerHandler(env, config)
end
t_insert(breakdown.SkillTriggerRate, 1, "100% ^8(Base chance)")
end
if triggerBotsEffective then
t_insert(breakdown.SkillTriggerRate, 3, "x 2 ^8(Trigger bots effectively cause the skill to trigger twice)")
end
if hits_per_cast > 1 then
t_insert(breakdown.SkillTriggerRate, 3, s_format("x %.2f ^8(hits per triggered skill cast)", hits_per_cast))
end
if simBreakdown.extraSimInfo then
t_insert(breakdown.SkillTriggerRate, "")
t_insert(breakdown.SkillTriggerRate, simBreakdown.extraSimInfo)
Expand Down