Skip to content

Port item comparison features from PoB 1: enchant copy and jewel socket sorting #1798

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

Draft
vaisest wants to merge 1 commit into
base: dev
Choose a base branch
from
+80 −9
Draft

Port item comparison features from PoB 1: enchant copy and jewel socket sorting #1798

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
76 changes: 68 additions & 8 deletions src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,18 +1479,78 @@ function ItemsTabClass:DeleteItem(item, deferUndoState)
end
end

local function isAnointable(item)
return (item.canBeAnointed or item.base.type == "Amulet")
end

local function isAugmentable(item)
return (item.sockets and #item.sockets > 0) or (item.base.socketLimit and item.base.socketLimit > 0)
end

function ItemsTabClass:copyAnointsAndAugments(newItem, copyAugments, overwrite, sourceSlotName)
local newItemType = sourceSlotName or (newItem.base.weapon and "Weapon 1" or newItem.base.type)
-- tabula rasa has jewel sockets which don't apply here
if newItem.name == "Tabula Rasa, Garment" then return end
if self.activeItemSet[newItemType] then
local currentItem = self.activeItemSet[newItemType].selItemId and self.items[self.activeItemSet[newItemType].selItemId]
-- if you don't have an equipped item that matches the type of the newItem, no need to do anything
if currentItem then
local modifiableItem = not (newItem.corrupted or newItem.mirrored or newItem.sanctified)
-- if the new item is anointable and does not have an anoint and your current respective item does, apply that anoint to the new item
if isAnointable(newItem) and (#newItem.enchantModLines == 0 or overwrite) and self.activeItemSet[newItemType].selItemId > 0 and modifiableItem then
local currentAnoint = currentItem.enchantModLines
newItem.enchantModLines = currentAnoint
end

--https://www.poe2wiki.net/wiki/Augment_socket
-- augments, given there are enough sockets

local hasEmptySockets = true
for i = 1, #newItem.runes do
if newItem.runes[i] ~= "None" then
hasEmptySockets = false
break
end
end
local shouldChangeAugments = copyAugments and isAugmentable(newItem) and
(#newItem.runes == 0 or hasEmptySockets or overwrite)

-- current runes sans "None"
local currentRunes = {}
for i = 1, #currentItem.runes do
if currentItem.runes[i] ~= "None" then
table.insert(currentRunes, currentItem.runes[i])
end
end
-- add sockets, if necessary and possible
if shouldChangeAugments and isAugmentable(newItem) and modifiableItem and #newItem.sockets < #currentItem.sockets then
local maxSockets = modifiableItem and math.min(#currentItem.sockets, newItem.base.socketLimit)
local neededSockets = math.max(0, maxSockets - #newItem.sockets)
for i = 1, neededSockets do
table.insert(newItem.runes, "None")
table.insert(newItem.sockets, { group = #newItem.sockets + 1})
end
newItem.itemSocketCount = #newItem.sockets
newItem:UpdateRunes()
end
-- replace runes with current ones, or set to none
if shouldChangeAugments then
for i = 1, #newItem.sockets do
newItem.runes[i] = currentRunes[i] or "None"
end
newItem:UpdateRunes()
end

newItem:BuildAndParseRaw()
end
end
end

-- Attempt to create a new item from the given item raw text and sets it as the new display item
function ItemsTabClass:CreateDisplayItemFromRaw(itemRaw, normalise)
local newItem = new("Item", itemRaw)
if newItem.base then
-- if the new item is an amulet and does not have an anoint and your current amulet does, apply that anoint to the new item
if newItem.base.type == "Amulet" and #newItem.enchantModLines == 0 and self.activeItemSet["Amulet"].selItemId > 0 then
local currentAnoint = self.items[self.activeItemSet["Amulet"].selItemId].enchantModLines
if currentAnoint and #currentAnoint == 1 then -- skip if amulet has more than one anoint e.g. Stranglegasp
newItem.enchantModLines = currentAnoint
newItem:BuildAndParseRaw()
end
end
self:copyAnointsAndAugments(newItem, main.migrateAugments, false)
if normalise then
newItem:NormaliseQuality()
newItem:BuildModList()
Expand Down
13 changes: 12 additions & 1 deletion src/Modules/Main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ function main:Init()
self.dpiScaleOverridePercent = GetDPIScaleOverridePercent and GetDPIScaleOverridePercent() or 0
self.showWarnings = true
self.slotOnlyTooltips = true
self.migrateAugments = true
self.notSupportedModTooltips = true
self.notSupportedTooltipText = " ^8(Not supported in PoB yet)"
self.POESESSID = ""
Expand Down Expand Up @@ -788,6 +789,7 @@ function main:SaveSettings()
lastExportWebsite = self.lastExportWebsite,
showWarnings = tostring(self.showWarnings),
slotOnlyTooltips = tostring(self.slotOnlyTooltips),
migrateAugments = tostring(self.migrateAugments),
notSupportedModTooltips = tostring(self.notSupportedModTooltips),
POESESSID = self.POESESSID,
invertSliderScrollDirection = tostring(self.invertSliderScrollDirection),
Expand Down Expand Up @@ -873,7 +875,7 @@ function main:OpenOptionsPopup()
end

local defaultLabelSpacingPx = -4
local defaultLabelPlacementX = 240
local defaultLabelPlacementX = popupWidth*0.45

drawSectionHeader("app", "Application options")

Expand Down Expand Up @@ -1077,6 +1079,13 @@ function main:OpenOptionsPopup()
self.slotOnlyTooltips = state
end)
controls.slotOnlyTooltips.state = self.slotOnlyTooltips

nextRow()
controls.migrateAugments = new("CheckBoxControl", { "TOPLEFT", nil, "TOPLEFT" }, { defaultLabelPlacementX, currentY, 20 }, "^7Copy augments onto display item:", function(state)
self.migrateAugments = state
end)
controls.migrateAugments.tooltipText = "Apply augments and anoints from current gear when comparing new gear, given they are possible to add to the new item."
controls.migrateAugments.state = self.migrateAugments

nextRow()
controls.notSupportedModTooltips = new("CheckBoxControl", { "TOPLEFT", nil, "TOPLEFT" }, { defaultLabelPlacementX, currentY, 20 }, "^7Show tooltip for unsupported mods :", function(state)
Expand Down Expand Up @@ -1124,6 +1133,7 @@ function main:OpenOptionsPopup()
local initialDefaultItemAffixQuality = self.defaultItemAffixQuality or 0.5
local initialShowWarnings = self.showWarnings
local initialSlotOnlyTooltips = self.slotOnlyTooltips
local initialMigrateAugments = self.migrateAugments
local initialNotSupportedModTooltips = self.notSupportedModTooltips
local initialInvertSliderScrollDirection = self.invertSliderScrollDirection
local initialDisableDevAutoSave = self.disableDevAutoSave
Expand Down Expand Up @@ -1181,6 +1191,7 @@ function main:OpenOptionsPopup()
self.defaultItemAffixQuality = initialDefaultItemAffixQuality
self.showWarnings = initialShowWarnings
self.slotOnlyTooltips = initialSlotOnlyTooltips
self.migrateAugments = initialMigrateAugments
self.notSupportedModTooltips = initialNotSupportedModTooltips
self.invertSliderScrollDirection = initialInvertSliderScrollDirection
self.disableDevAutoSave = initialDisableDevAutoSave
Expand Down