Skip to content

Fix Mana-infused staff allowing life reservation #10283

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
cupkax wants to merge 2 commits into
base: dev
Choose a base branch
from
+13 −1
Open

Fix Mana-infused staff allowing life reservation #10283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
361c944
Fix Mana-infused staff being able to be supported by arrogance
cupkax Aug 24, 2026
f23669e
Prevent life reservation for mana-infused staff
cupkax Aug 24, 2026
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
9 changes: 8 additions & 1 deletion src/Modules/CalcPerform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,14 @@ function calcs.perform(env, skipEHP)
breakdown.ManaReserved = { reservations = { } }
end
for _, activeSkill in ipairs(env.player.activeSkillList) do
if (activeSkill.skillTypes[SkillType.HasReservation] or activeSkill.skillData.triggeredByAutoexertion ) and not activeSkill.skillTypes[SkillType.ReservationBecomesCost] then
-- Mana-Infused Staff does nothing unless it actually reserves mana
local noManaReservation = activeSkill.activeEffect.grantedEffect.id == "ManaInfusedStaff"
and (activeSkill.skillModList:Flag(activeSkill.skillCfg, "BloodMagicReserved") or (output.Mana or 0) == 0)
if noManaReservation then
activeSkill.skillFlags.disable = true
activeSkill.disableReason = "This skill requires reserving Mana"
end
if (activeSkill.skillTypes[SkillType.HasReservation] or activeSkill.skillData.triggeredByAutoexertion ) and not activeSkill.skillTypes[SkillType.ReservationBecomesCost] and not noManaReservation then
local skillModList = activeSkill.skillModList
local skillCfg = activeSkill.skillCfg
local mult = floor(skillModList:More(skillCfg, "SupportManaMultiplier"), 4)
Expand Down
5 changes: 5 additions & 0 deletions src/Modules/CalcTools.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ function calcLib.canGrantedEffectSupportActiveSkill(grantedEffect, activeSkill,
return false
end

-- Mana-Infused Staff cannot be supported by Arrogance in game
if grantedEffect.id == "SupportArrogance" and activeSkill.activeEffect.grantedEffect.id == "ManaInfusedStaff" then
return false
end

-- Special case for things like Forbidden Shako or Hungry Loop with for example Prismatic Burst and another compatible support
if not appliesToGrantedSkills and grantedEffect.fromItem and grantedEffect.support and (activeSkill.activeEffect.grantedEffect.fromItem or activeSkill.activeEffect.grantedEffect.modSource:sub(1, #"Item") == "Item" or (activeSkill.activeEffect.srcInstance and activeSkill.activeEffect.srcInstance.fromItem)) then
return false
Expand Down
Loading