Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 10 additions & 1 deletion src/Classes/Item.lua
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ local lineFlags = {
-- in poe2. this is currently only added as a hack for cane of kulemak and
-- should be added based on mod tags after matching a mod in the future
["unveiled"] = true,
["vestigial"] = true,
}

-- Special function to store unique instances of modifier on specific item slots
Expand Down Expand Up @@ -690,6 +691,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
end
elseif specName == "CatalystQuality" then
self.catalystQuality = specToNumber(specVal)
elseif specName == "Intangibility" then
self.intangibility = specToNumber(specVal)
elseif specName == "Note" then
self.note = specVal
elseif specName == "Str" or specName == "Strength" or specName == "Dex" or specName == "Dexterity" or
Expand Down Expand Up @@ -791,7 +794,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.name = self.name:gsub(" %(.+%)","")
end
if not baseName then
baseName = line:gsub("^Superior ", ""):gsub("^Synthesised ","")
baseName = line:gsub("^Superior ", ""):gsub("^Synthesised ", ""):gsub("^Vestigial ", "")
end
if baseName == "Two-Toned Boots" then
baseName = "Two-Toned Boots (Armour/Energy Shield)"
Expand Down Expand Up @@ -1479,6 +1482,9 @@ function ItemClass:BuildRaw()
end
end
end
if self.intangibility then
t_insert(rawLines, string.format("Intangibility: %d%%", self.intangibility))
end
if self.uniqueID then
t_insert(rawLines, "Unique ID: " .. self.uniqueID)
end
Expand Down Expand Up @@ -1574,6 +1580,9 @@ function ItemClass:BuildRaw()
if modLine.unscalable then
line = "{unscalable}" .. line
end
if modLine.vestigial then
line = "{vestigial}" .. line
end
if modLine.variantList then
local varSpec
for varId in pairs(modLine.variantList) do
Expand Down
7 changes: 6 additions & 1 deletion src/Classes/ItemsTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4272,7 +4272,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
end
end
end

if item.catalyst and item.catalyst > 0 and item.catalyst <= #catalystQualityFormat and item.catalystQuality and item.catalystQuality > 0 then
tooltip:AddLine(fontSizeBig, s_format(catalystQualityFormat[item.catalyst], item.catalystQuality), "FONTIN SC")
tooltip:AddSeparator(10)
Expand Down Expand Up @@ -4314,6 +4314,11 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
tooltip:AddSeparator(10)
end

if item.intangibility then
tooltip:AddLine(fontSizeBig, colorCodes.INTANGIBILITY .. s_format("Intangibility: ^7%d%%", item.intangibility), "FONTIN SC")
tooltip:AddSeparator(10)
end

-- Requirements
self.build:AddRequirementsToTooltip(tooltip, item.requirements.level,
item.requirements.strMod, item.requirements.dexMod, item.requirements.intMod,
Expand Down
4 changes: 3 additions & 1 deletion src/Data/Global.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ colorCodes = {
SAPBG = "^x261500",
SCOURGE = "^xFF6E25",
CRUCIBLE = "^xFFA500",
SPLITPERSONALITY = "^xFFD62A"
SPLITPERSONALITY = "^xFFD62A",
VESTIGIAL = "^xCBA5F1",
INTANGIBILITY = "^x9BF4BD",
}
colorCodes.STRENGTH = colorCodes.MARAUDER
colorCodes.DEXTERITY = colorCodes.RANGER
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/ItemTools.lua
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ function itemLib.formatModLine(modLine, dbMode)
line = line .. " ^1'" .. modLine.extra .. "'"
end
else
colorCode = (modLine.fractured and colorCodes.FRACTURED) or (modLine.crafted and colorCodes.CRAFTED) or (modLine.mutated and colorCodes.MUTATED) or (modLine.scourge and colorCodes.SCOURGE) or (modLine.custom and colorCodes.CUSTOM) or (modLine.crucible and colorCodes.CRUCIBLE) or colorCodes.MAGIC
colorCode = (modLine.fractured and colorCodes.FRACTURED) or (modLine.crafted and colorCodes.CRAFTED) or (modLine.mutated and colorCodes.MUTATED) or (modLine.scourge and colorCodes.SCOURGE) or (modLine.custom and colorCodes.CUSTOM) or (modLine.crucible and colorCodes.CRUCIBLE) or (modLine.vestigial and colorCodes.VESTIGIAL) or colorCodes.MAGIC
end
return colorCode..line
end
Expand Down
Loading