Skip to content

Fix Turtle Charm Max Block override not working #1393

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 3 commits into from
Sep 16, 2025
Merged

Fix Turtle Charm Max Block override not working #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
133ca6e
Weekly beta release
github-actions[bot] Sep 15, 2025
dd84897
Fix Beta changelogs
Sep 15, 2025
1ef7ed5
Fix Turtle Charm max block override not working
Sep 15, 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
8 changes: 4 additions & 4 deletions src/Modules/CalcDefence.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ function calcs.defence(env, actor)
-- Unnatural Resilience needs FireResistTotal before we calc FireResistMax
output[elem.."ResistTotal"] = total
if modDB:Flag(nil, "MaxBlockChanceModsApplyMaxResist") then
local blockMaxBonus = modDB:Sum("BASE", nil, "BlockChanceMax") - 75 -- Subtract base block cap
local blockMaxBonus = modDB:Override(nil, "BlockChanceMax") and 0 or modDB:Sum("BASE", nil, "BlockChanceMax")
max = (modDB:Override(nil, elem.."ResistMax") or m_min(data.misc.MaxResistCap, modDB:Sum("BASE", nil, elem.."ResistMax", isElemental[elem] and "ElementalResistMax"))) + blockMaxBonus
else
max = modDB:Override(nil, elem.."ResistMax") or m_min(data.misc.MaxResistCap, modDB:Sum("BASE", nil, elem.."ResistMax", isElemental[elem] and "ElementalResistMax"))
Expand Down Expand Up @@ -941,9 +941,9 @@ function calcs.defence(env, actor)

-- Block
if modDB:Flag(nil, "MaxBlockChanceModsApplyMaxResist") then
output.BlockChanceMax = 75
output.BlockChanceMax = modDB:Override(nil, "BlockChanceMax") or modDB:Sum("BASE", nil, "BaseBlockChanceMax")
else
output.BlockChanceMax = m_min(modDB:Sum("BASE", nil, "BlockChanceMax"), data.misc.BlockChanceCap)
output.BlockChanceMax = m_min(modDB:Override(nil, "BlockChanceMax") or (modDB:Sum("BASE", nil, "BaseBlockChanceMax") + modDB:Sum("BASE", nil, "BlockChanceMax")), data.misc.BlockChanceCap)
end
if modDB:Flag(nil, "MaximumBlockAttackChanceIsEqualToParent") then
output.BlockChanceMax = actor.parent.output.BlockChanceMax
Expand Down Expand Up @@ -976,7 +976,7 @@ function calcs.defence(env, actor)
if modDB:Flag(nil, "SpellBlockChanceMaxIsBlockChanceMax") then
output.SpellBlockChanceMax = output.BlockChanceMax
else
output.SpellBlockChanceMax = m_min(modDB:Sum("BASE", nil, "SpellBlockChanceMax"), data.misc.BlockChanceCap)
output.SpellBlockChanceMax = m_min(modDB:Override(nil, "BlockChanceMax") or (modDB:Sum("BASE", nil, "BaseSpellBlockChanceMax") + modDB:Sum("BASE", nil, "SpellBlockChanceMax")), data.misc.BlockChanceCap)
end
if modDB:Flag(nil, "MaxSpellBlockIfNotBlockedRecently") then
output.SpellBlockChance = output.SpellBlockChanceMax
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/CalcSections.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,7 +1683,7 @@ return {
extra = "{0:output:EffectiveBlockChance}%",
{ label = "Block Chance", { format = "{0:output:BlockChance}% (+{0:output:BlockChanceOverCap}%)",
{ breakdown = "BlockChance" },
{ modName = { "BlockChance", "ReplaceShieldBlock" } },
{ modName = { "BlockChance", "ReplaceShieldBlock", "BlockChanceMax" } },
}, },
{ label = "Taken From Block", haveOutput = "ShowBlockEffect", { format = "{0:output:DamageTakenOnBlock}%",
{ breakdown = "BlockEffect" },
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/CalcSetup.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ function calcs.initModDB(env, modDB)
modDB:NewMod("TotemColdResistMax", "BASE", 75, "Base")
modDB:NewMod("TotemLightningResistMax", "BASE", 75, "Base")
modDB:NewMod("TotemChaosResistMax", "BASE", 75, "Base")
modDB:NewMod("BlockChanceMax", "BASE", data.characterConstants["object_inherent_base_maximum_block_%_from_ot"], "Base")
modDB:NewMod("SpellBlockChanceMax", "BASE", data.characterConstants["object_inherent_base_maximum_block_%_from_ot"], "Base")
modDB:NewMod("BaseBlockChanceMax", "OVERRIDE", data.characterConstants["object_inherent_base_maximum_block_%_from_ot"], "Base")
modDB:NewMod("BaseSpellBlockChanceMax", "OVERRIDE", data.characterConstants["object_inherent_base_maximum_block_%_from_ot"], "Base")
modDB:NewMod("SpellDodgeChanceMax", "BASE", 75, "Base")
modDB:NewMod("ChargeDuration", "BASE", 15, "Base")
modDB:NewMod("PowerChargesMax", "BASE", data.characterConstants["max_power_charges"], "Base")
Expand Down