Skip to content

Add support for Subsume the Source #10104

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

Closed
vaisest wants to merge 2 commits into from
Closed

Add support for Subsume the Source #10104

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
1ee5ac6
Add support for having rare mod crafting on uniques
vaisest Aug 3, 2026
67dc47d
Add example for veiled mod item (crimson storm)
vaisest Aug 3, 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
65 changes: 57 additions & 8 deletions src/Classes/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.baseLines = { }
self.foulborn = false
self.mutatedLines = nil
---@type RareLikeUniqueDescription?
self.rareLikeUnique = nil
local importedLevelReq
local flaskBuffLines
local tinctureBuffLines
Expand Down Expand Up @@ -563,15 +565,16 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
local backupAffixList = { }
for modId, modData in pairs(self.affixes) do
if modData.affix == modName then
local ignoreModType = self.rareLikeUnique and self.rareLikeUnique.ignorePrefixSuffix
if self:CanHaveMod(modData) then
if modData.type == "Prefix" then
if modData.type == "Prefix" or ignoreModType then
t_insert(self.pendingAffixList, { modId = modId, table = self.prefixes })
elseif modData.type == "Suffix" then
t_insert(self.pendingAffixList, { modId = modId, table = self.suffixes })
end
else
-- Conqueror mods can't natively spawn on items, so we'll use those if we don't find a match otherwise
if modData.type == "Prefix" then
if modData.type == "Prefix" or ignoreModType then
t_insert(backupAffixList, { modId = modId, table = self.prefixes })
elseif modData.type == "Suffix" then
t_insert(backupAffixList, { modId = modId, table = self.suffixes })
Expand Down Expand Up @@ -752,6 +755,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.variantAlt4 = specToNumber(specVal)
elseif specName == "Selected Alt Variant Five" then
self.variantAlt5 = specToNumber(specVal)
elseif specName == "Allow Duplicate Variants" then
self.allowDuplicateVariants = specVal == "true"
elseif specName == "Has Variants" or specName == "Selected Variants" then
-- Need to skip this line for backwards compatibility
-- with builds that used an old Watcher's Eye implementation
Expand Down Expand Up @@ -1000,6 +1005,10 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.affixes = (self.base.subType and data.itemMods[self.base.type..self.base.subType])
or data.itemMods[self.base.type]
or data.itemMods.Item
if self.title and data.rareLikeUniques[self.title:lower()] then
self.rareLikeUnique = data.rareLikeUniques[self.title:lower()]
self.affixes = self.rareLikeUnique.affixes
end
if self.base.flask then
if self.base.utility_flask then
self.enchantments = data.enchantments["UtilityFlask"]
Expand Down Expand Up @@ -1372,6 +1381,10 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
end
for _, mods in ipairs(modLists) do
for _, mod in ipairs(mods or {}) do
-- avoid scaling variant lines which are not active
if mod.variantList and (self:GetModLineVariantCount(mod) == 0) then
goto modMagnitudeContinue
end
-- Create a fast lookup table for all provided tags
local tagLookup = {}
for _, curTag in ipairs(mod.modTags) do
Expand Down Expand Up @@ -1400,12 +1413,13 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
end
end
if mod.valueScalar and mod.valueScalar ~= 1 then
local rangedLine = itemLib.applyRange(mod.line, mod.range, mod.valueScalar, 1)
local rangedLine = itemLib.applyRange(mod.line, mod.range or 1, mod.valueScalar, 1)
local modList, extra = modLib.parseMod(rangedLine)
mod.displayValueScalar = 1
mod.modList = modList
mod.extra = extra
end
::modMagnitudeContinue::
end
end
end
Expand Down Expand Up @@ -1433,6 +1447,10 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.suffixes.limit = m_max(m_min((self.suffixes.limit or 0) + self.affixLimit / 2, self.affixLimit), 0)
self.affixLimit = self.prefixes.limit + self.suffixes.limit
end
elseif self.rareLikeUnique then
self.affixLimit = self.rareLikeUnique.affixLimits.affixLimit
self.prefixes.limit = self.rareLikeUnique.affixLimits.prefixLimit
self.suffixes.limit = self.prefixes.limit and (self.affixLimit - self.prefixes.limit) or nil
else
self.crafted = false
end
Expand Down Expand Up @@ -1910,6 +1928,9 @@ function ItemClass:BuildRaw()
t_insert(rawLines, "Has Alt Variant Five: true")
t_insert(rawLines, "Selected Alt Variant Five: " .. self.variantAlt5)
end
if self.allowDuplicateVariants then
t_insert(rawLines, "Allow Duplicate Variants: true")
end
end
if not self.variantList then
for _, baseLine in pairs(self.baseLines or { }) do
Expand Down Expand Up @@ -1990,7 +2011,7 @@ function ItemClass:Craft()
-- Save off any crafted or custom mods so they can be re-added at the end
local savedMods = {}
for _, mod in ipairs(self.explicitModLines) do
if mod.crafted or mod.custom then
if mod.crafted or mod.custom or (self.rareLikeUnique and not (mod.prefix or mod.suffix)) then
t_insert(savedMods, mod)
end
end
Expand All @@ -2000,7 +2021,8 @@ function ItemClass:Craft()
self.nameSuffix = ""
self.requirements.level = self.base.req.level
local statOrder = { }
for _, list in ipairs({self.prefixes,self.suffixes}) do
local modLists = { self.prefixes, self.suffixes }
for _, list in ipairs(modLists) do
for i = 1, (list.limit or (self.affixLimit / 2)) do
local affix = list[i]
if not affix then
Expand Down Expand Up @@ -2079,6 +2101,23 @@ function ItemClass:CheckModLineVariant(modLine)
or (self.hasAltVariant5 and modLine.variantList[self.variantAlt5])
end

function ItemClass:GetModLineVariantCount(modLine)
if not self.allowDuplicateVariants or not modLine.variantList then
return self:CheckModLineVariant(modLine) and 1 or 0
end

-- Mageblood can intentionally select the same variant more than once.
local variantList = modLine.variantList
local count = variantList[self.variant] and 1 or 0
for i = 1, 5 do
local suffix = i == 1 and "" or i
local variant = self["variantAlt" .. suffix]
if self["hasAltVariant" .. suffix] and variant and variantList[variant] then
count = count + 1
end
end
return count
end
-- Return the name of the slot this item is equipped in
function ItemClass:GetPrimarySlot()
if self.base.weapon then
Expand Down Expand Up @@ -2468,7 +2507,8 @@ function ItemClass:BuildModList()
if modLine.disabled then
return
end
if self:CheckModLineVariant(modLine) then
local variantCount = self:GetModLineVariantCount(modLine)
if variantCount > 0 then
-- special section for variant over-ride of pre-modifier item parameters
if modLine.line:find("Requires Class") then
self.classRestriction = modLine.line:gsub("{variant:([%d,]+)}", ""):match("Requires Class (.+)")
Expand All @@ -2485,8 +2525,9 @@ function ItemClass:BuildModList()
end
if not modLine.extra then
for _, mod in ipairs(modLine.modList) do
mod = modLib.setSource(mod, self.modSource)
baseList:AddMod(mod)
for _ = 1, variantCount do
baseList:AddMod(modLib.setSource(mod, self.modSource))
end
end
if modLine.modTags and #modLine.modTags > 0 then
self.hasModTags = true
Expand Down Expand Up @@ -2546,6 +2587,7 @@ function ItemClass:BuildModList()
-- Remove all sockets
wipeTable(self.sockets)
self.selectableSocketCount = 0
self.abyssalSocketCount = 0
elseif socketCount > 0 then
-- Force the socket count to be equal to the stated number
self.selectableSocketCount = socketCount
Expand Down Expand Up @@ -2613,6 +2655,13 @@ function ItemClass:CanHaveMod(mod)
if data.minionTagCrucibleUniques[self.title] then
includeTags["minion_unique_weapon"] = true
end
if self.rareLikeUnique then
for _, base in ipairs(self.rareLikeUnique.validBases) do
if self:GetModSpawnWeight(mod, base.base.tags) > 0 then
return true
end
end
end
if self.canHaveOnlySupportSkillsCrucibleTree then
return keyMap["crucible_unique_staff"] and mod.weightVal[keyMap["crucible_unique_staff"]] ~= 0
elseif self.canHaveShieldCrucibleTree then
Expand Down
30 changes: 20 additions & 10 deletions src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,10 @@ holding Shift will put it in the second.]])
drop.slider = slider
self.controls["displayItemAffix"..i] = drop
self.controls["displayItemAffixLabel"..i] = new("LabelControl", {"RIGHT",drop,"LEFT"}, {-4, 0, 0, 14}, function()
return drop.outputTable == "prefixes" and "^7Prefix:" or "^7Suffix:"
local ignoreModType = self.displayItem.rareLikeUnique and self.displayItem.rareLikeUnique.ignorePrefixSuffix
return ignoreModType and "^7Explicit:"
or drop.outputTable == "prefixes" and "^7Prefix:"
or "^7Suffix:"
end)
self.controls["displayItemAffixRange"..i] = slider
self.controls["displayItemAffixRangeLabel"..i] = new("LabelControl", {"RIGHT",slider,"LEFT"}, {-4, 0, 0, 14}, function()
Expand Down Expand Up @@ -2075,9 +2078,14 @@ end
function ItemsTabClass:UpdateAffixControls()
local item = self.displayItem
local prefixLimit = item.prefixes.limit or (item.affixLimit / 2)
local ignoreModType = item.rareLikeUnique and item.rareLikeUnique.ignorePrefixSuffix
for i = 1, item.affixLimit do
if i <= prefixLimit then
self:UpdateAffixControl(self.controls["displayItemAffix"..i], item, "Prefix", "prefixes", i)
local modType = "Prefix"
if ignoreModType then
modType = nil
end
self:UpdateAffixControl(self.controls["displayItemAffix" .. i], item, modType, "prefixes", i)
else
self:UpdateAffixControl(self.controls["displayItemAffix"..i], item, "Suffix", "suffixes", i - prefixLimit)
end
Expand All @@ -2095,7 +2103,8 @@ function ItemsTabClass:UpdateAffixControl(control, item, affixType, outputTable,
if index ~= outputIndex or table ~= outputTable then
local mod = item.affixes[item[table][index] and item[table][index].modId]
if mod then
if mod.group then
local allowDuplicateAffixes = item.rareLikeUnique and item.rareLikeUnique.allowsDuplicates
if mod.group and not allowDuplicateAffixes then
excludeGroups[mod.group] = true
end
if mod.tags then
Expand All @@ -2117,8 +2126,8 @@ function ItemsTabClass:UpdateAffixControl(control, item, affixType, outputTable,
local affixList = { }
local retainedAffixes = { }
for modId, mod in pairs(item.affixes) do
if mod.type == affixType and not excludeGroups[mod.group] and not item:CheckIfModIsDelve(mod) then
if item:GetModSpawnWeight(mod, extraTags) > 0 then
if (not affixType or (mod.type == affixType)) and not excludeGroups[mod.group] and not item:CheckIfModIsDelve(mod) then
if (item.rareLikeUnique and item:CanHaveMod(mod)) or item:GetModSpawnWeight(mod, extraTags) > 0 then
t_insert(affixList, modId)
elseif modId == selAffix then
t_insert(affixList, modId)
Expand Down Expand Up @@ -2223,7 +2232,7 @@ function ItemsTabClass:UpdateCustomControls()
t_insert(modLines, line)
end
end
if item.rarity == "MAGIC" or item.rarity == "RARE" or (item.crucibleModLines and #item.crucibleModLines > 0) then
if item.rareLikeUnique or item.rarity == "MAGIC" or item.rarity == "RARE" or (item.crucibleModLines and #item.crucibleModLines > 0) then
for index, modLine in ipairs(modLines) do
if modLine.custom or modLine.crafted or modLine.crucible then
local line = itemLib.formatModLine(modLine)
Expand Down Expand Up @@ -4484,10 +4493,11 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
for _, modList in ipairs{item.enchantModLines, item.scourgeModLines, item.implicitModLines, item.explicitModLines, item.crucibleModLines} do
if modList[1] then
for _, modLine in ipairs(modList) do
if item:CheckModLineVariant(modLine) then
local formatted = itemLib.formatModLine(modLine, dbMode)
if formatted then
tooltip:AddLine(fontSizeBig, formatted, "FONTIN SC", modLine)
local variantCount = item:GetModLineVariantCount(modLine)
if variantCount > 0 then
local formattedModLine = itemLib.formatModLine(modLine, dbMode)
for _ = 1, variantCount do
tooltip:AddLine(fontSizeBig, formattedModLine, "FONTIN SC")
end
end
end
Expand Down
Loading