Skip to content

Fix Weapon comparison with Giant's Blood #809

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
merged 1 commit into from
Apr 4, 2025
Merged

Fix Weapon comparison with Giant's Blood #809

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
11 changes: 9 additions & 2 deletions src/Modules/CalcSetup.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,14 +712,21 @@ function calcs.initEnv(build, mode, override, specEnv)
if not accelerate.requirementsItems then
local items = {}
local jewelLimits = {}
local giantsBlood = true
if build.calcsTab and build.calcsTab.mainEnv then
giantsBlood = build.calcsTab.mainEnv.modDB:Flag(nil, "GiantsBlood")
end
for _, slot in pairs(build.itemsTab.orderedSlots) do
local slotName = slot.slotName
local item
if slotName == override.repSlotName then
item = override.repItem
elseif override.repItem and override.repSlotName:match("^Weapon 1") and slotName:match("^Weapon 2") and
(override.repItem.base.type == "Staff" or override.repItem.base.type == "Two Handed Sword" or override.repItem.base.type == "Two Handed Axe" or override.repItem.base.type == "Two Handed Mace"
or (override.repItem.base.type == "Bow" and item and item.base.type ~= "Quiver")) then
(
override.repItem.base.type == "Staff"
or (not giantsBlood and (override.repItem.base.type == "Two Handed Sword" or override.repItem.base.type == "Two Handed Axe" or override.repItem.base.type == "Two Handed Mace"))
or (override.repItem.base.type == "Bow" and item and item.base.type ~= "Quiver")
) then
goto continue
elseif slot.nodeId and override.spec then
item = build.itemsTab.items[env.spec.jewels[slot.nodeId]]
Expand Down