Skip to content

Fix Spellslinger selecting invalid trigger skills #10110

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 1 commit into from
Aug 4, 2026
+10 −2
Merged

Fix Spellslinger selecting invalid trigger skills #10110

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
8 changes: 8 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 @@ -1055,13 +1055,21 @@ describe("TestTriggers", function()
build.itemsTab:AddDisplayItem()
runCallback("OnFrame")

build.itemsTab:CreateDisplayItemFromRaw("Test Shield\nSplintered Tower Shield")
build.itemsTab:AddDisplayItem()
runCallback("OnFrame")

build.skillsTab:PasteSocketGroup("Arc 20/0 1\nSpellslinger 20/0 1\n")
runCallback("OnFrame")

build.skillsTab:PasteSocketGroup("Kinetic Blast 20/0 1\n")
runCallback("OnFrame")

build.skillsTab:PasteSocketGroup("Shield Charge 20/0 1\nFaster Attacks 20/0 1\n")
runCallback("OnFrame")

assert.True(build.calcsTab.mainOutput.SkillTriggerRate ~= nil)
assert.are.equals("Spellslinger's Trigger: Kinetic Blast", build.calcsTab.mainEnv.player.mainSkill.infoMessage)
end)

it("Trigger Mark On Hit", function()
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/CalcTriggers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,8 +1201,8 @@ local configTable = {
return {triggerName = "Spellslinger",
triggerOnUse = true,
triggerSkillCond = function(env, skill)
local isWandAttack = (not skill.weaponTypes or (skill.weaponTypes and skill.weaponTypes["Wand"])) and skill.skillTypes[SkillType.Attack]
return isWandAttack and not skill.skillData.triggeredBySpellSlinger
local isWandProjectileAttack = skill.skillTypes[SkillType.Attack] and skill.skillTypes[SkillType.Projectile] and band(skill.skillCfg.flags, ModFlag.Wand) > 0
return isWandProjectileAttack and not skill.skillData.triggeredBySpellSlinger
end}
end,
["call to arms"] = function(env) -- This is for backwards compatibility only
Expand Down
Loading