Skip to content

Add runes from 0.5 #2019

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
Blitz54 wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft

Add runes from 0.5 #2019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72778bb
Add runes from 0.5 and remove DNT runes
Blitz54 May 30, 2026
c8a6f18
Fix quarterstaff and buckler stuff
Blitz54 May 30, 2026
5cc3923
AI Fix for some weird mods
Blitz54 May 30, 2026
2cdf4ff
Fix abyssal eyes and import other runes
Blitz54 May 31, 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
60 changes: 32 additions & 28 deletions src/Classes/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ end
local ItemClass = newClass("Item", function(self, raw, rarity, highQuality)
if raw then
self:ParseRaw(sanitiseText(raw), rarity, highQuality)
end
end
end)

local lineFlags = {
Expand Down Expand Up @@ -395,7 +395,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
local linePrefix = ""
local linePostfix = ""

while self.rawLines[l] do
while self.rawLines[l] do
local line = self.rawLines[l]
if flaskBuffLines and flaskBuffLines[line] then
flaskBuffLines[line] = nil
Expand Down Expand Up @@ -686,8 +686,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.requirements[specName:sub(1,3):lower()] = specToNumber(specVal)
elseif specName == "Critical Hit Range" or specName == "Attacks per Second" or specName == "Weapon Range" or
specName == "Critical Hit Chance" or specName == "Physical Damage" or specName == "Elemental Damage" or
specName == "Chaos Damage" or specName == "Fire Damage" or specName == "Cold Damage" or specName == "Lightning Damage" or
specName == "Reload Time" or specName == "Chance to Block" or specName == "Block chance" or
specName == "Chaos Damage" or specName == "Fire Damage" or specName == "Cold Damage" or specName == "Lightning Damage" or
specName == "Reload Time" or specName == "Chance to Block" or specName == "Block chance" or
specName == "Armour" or specName == "Energy Shield" or specName == "Evasion" or specName == "Requires" then
self.hidden_specs = true
-- Anything else is an explicit with a colon in it (Fortress Covenant, Pure Talent, etc) unless it's part of the custom name
Expand Down Expand Up @@ -863,7 +863,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.pendingAffixList = { pendingAffix }
break
end
end
end
end
end
-- Use rolling Delta/Range in case one range is 1-3 and another is 1-100 so we get the finest precision possible
Expand All @@ -888,7 +888,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
-- Use rolling Delta/Range in case one range is 1-3 and another is 1-100 so we get the finest precision possible
local bestPrecisionDelta = -1
local bestPrecisionRange = -1

-- Replace non-number ranges as unsupported
line = line:gsub("(%a+)%([%a%s]+%-[%a%s]+%)", "%1")

Expand Down Expand Up @@ -1122,7 +1122,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)

if result then -- we have found a valid combo for that rune category
remainingRunes = remainingRunes - numRunes
-- this code should probably be refactored to based off stored self.runes rather than the recomputed amounts off the runeModLines this
-- this code should probably be refactored to based off stored self.runes rather than the recomputed amounts off the runeModLines this
-- is too avoid having to run the relatively expensive recomputation every time the item is parsed even if we know the runes on the item already.
modLine.soulCore = groupedRunes[1].name:match("Soul Core") ~= nil
modLine.runeCount = numRunes
Expand All @@ -1143,7 +1143,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.runes = { }
end
end

if self.base and not self.requirements.level then
if importedLevelReq and #self.sockets == 0 then
-- Requirements on imported items can only be trusted for items with no sockets
Expand All @@ -1167,7 +1167,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
end
self.affixLimit = 0
if self.crafted then
if not self.affixes then
if not self.affixes then
self.crafted = false
elseif self.rarity == "MAGIC" then
if self.prefixes.limit or self.suffixes.limit then
Expand Down Expand Up @@ -1249,7 +1249,7 @@ function ItemClass:NormaliseQuality()
elseif not self.uniqueID and not self.corrupted and not self.mirrored and not (self.base.type == "Charm") and self.quality < self.base.quality then -- charms cannot be modified by quality currency.
self.quality = main.defaultItemQuality
end
end
end
end

function ItemClass:GetModSpawnWeight(mod, includeTags, excludeTags)
Expand Down Expand Up @@ -1383,7 +1383,7 @@ function ItemClass:BuildRaw()
if baseLine.variantList then
writeModLine(baseLine)
end
end
end
if self.hasAltVariant then
t_insert(rawLines, "Has Alt Variant: true")
t_insert(rawLines, "Selected Alt Variant: " .. self.variantAlt)
Expand Down Expand Up @@ -1477,7 +1477,7 @@ end
-- Rebuild rune modifiers using the item's runes
function ItemClass:UpdateRunes()
wipeTable(self.runeModLines)
local getModRunesForTypes = function(runeName, baseType, specificType)
local getModRunesForTypes = function(runeName, baseType, specificType)
local rune = data.itemMods.Runes[runeName]
local gatheredRuneMods = { }
if rune then
Expand All @@ -1486,21 +1486,26 @@ function ItemClass:UpdateRunes()
t_insert(gatheredRuneMods, rune[baseType])
-- end
end
if rune[specificType] then
if rune[specificType] then
-- for _, mod in pairs(rune[specificType]) do
t_insert(gatheredRuneMods, rune[specificType])
-- end
end
end
return gatheredRuneMods
end

local statOrder = {}
for i = 1, self.itemSocketCount do
local name = self.runes[i]
if name and name ~= "None" then
local baseType = self.base.weapon and "weapon" or self.base.armour and "armour" or (self.base.tags.wand or self.base.tags.staff) and "caster"
local specificType = self.base.type:lower()
local subType = self.base.subType and self.base.subType:lower()
local itemType = self.base.type:lower()
local baseType = self.base.weapon and "weapon" or self.base.armour and "armour" or (self.base.tags.wand or self.base.tags.staff or self.base.tags.sceptre) and "caster"
local specificType =
(subType == "warstaff" and "warstaff") or
(itemType == "shield" and subType == "evasion" and "buckler") or
itemType
local gatheredMods = getModRunesForTypes(name, baseType, specificType)
for _, mod in ipairs(gatheredMods) do
for i, modLine in ipairs(mod) do
Expand All @@ -1522,12 +1527,11 @@ function ItemClass:UpdateRunes()
end
end
statOrder[order] = modLine
end
end
end
end
end
end

end

-- Rebuild explicit modifiers using the item's affixes
Expand Down Expand Up @@ -1580,7 +1584,7 @@ function ItemClass:Craft()
end
end
statOrder[order] = modLine
end
end
end
end
end
Expand All @@ -1595,7 +1599,7 @@ function ItemClass:Craft()
end

function ItemClass:CheckModLineVariant(modLine)
return not modLine.variantList
return not modLine.variantList
or modLine.variantList[self.variant]
or (self.hasAltVariant and modLine.variantList[self.variantAlt])
or (self.hasAltVariant2 and modLine.variantList[self.variantAlt2])
Expand Down Expand Up @@ -1712,7 +1716,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
weaponData.AttackRate = round(self.base.weapon.AttackRateBase * (1 + weaponData.AttackSpeedInc / 100), 2)
weaponData.rangeBonus = calcLocal(modList, "WeaponRange", "BASE", 0) + 10 * calcLocal(modList, "WeaponRangeMetre", "BASE", 0) + m_floor(self.quality / 10 * calcLocal(modList, "AlternateQualityLocalWeaponRangePer10Quality", "BASE", 0))
weaponData.range = self.base.weapon.Range + weaponData.rangeBonus
if self.base.weapon.ReloadTimeBase then
if self.base.weapon.ReloadTimeBase then
weaponData.ReloadSpeedInc = calcLocal(modList, "ReloadSpeed", "INC", ModFlag.Attack) + weaponData.AttackSpeedInc
weaponData.ReloadTime = round(self.base.weapon.ReloadTimeBase / (1 + weaponData.ReloadSpeedInc / 100), 2)
end
Expand Down Expand Up @@ -1892,11 +1896,11 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
if jewelData.clusterJewelSkill and not self.clusterJewel.skills[jewelData.clusterJewelSkill] then
jewelData.clusterJewelSkill = nil
end
jewelData.clusterJewelValid = jewelData.clusterJewelKeystone
or ((jewelData.clusterJewelSkill or jewelData.clusterJewelSmallsAreNothingness) and jewelData.clusterJewelNodeCount)
jewelData.clusterJewelValid = jewelData.clusterJewelKeystone
or ((jewelData.clusterJewelSkill or jewelData.clusterJewelSmallsAreNothingness) and jewelData.clusterJewelNodeCount)
or (jewelData.clusterJewelSocketCountOverride and jewelData.clusterJewelNothingnessCount)
end
end
end
return { unpack(modList) }
end

Expand Down Expand Up @@ -1941,7 +1945,7 @@ function ItemClass:BuildModList()
if modLine.range then
-- Check if line actually has a range
if modLine.line:find("%((%-?%d+%.?%d*)%-(%-?%d+%.?%d*)%)") then
local strippedModeLine = modLine.line:gsub("\n"," ")
local strippedModeLine = modLine.line:gsub("\n"," ")
local catalystScalar = getCatalystScalar(self.catalyst, modLine, self.catalystQuality)
-- Put the modified value into the string
local line = itemLib.applyRange(strippedModeLine, modLine.range, catalystScalar, modLine.corruptedRange)
Expand Down Expand Up @@ -2052,9 +2056,9 @@ function ItemClass:BuildModList()
self.requirements.dexMod = 0
self.requirements.intMod = 0
elseif calcLocal(baseList, "AttributeRequirementsConverted", "FLAG", 0) then
local strConversion = calcLocal(baseList, "AttributeRequirementsConvertedToStrength", "BASE", 0) / 100
local dexConversion = calcLocal(baseList, "AttributeRequirementsConvertedToDexterity", "BASE", 0) / 100
local intConversion = calcLocal(baseList, "AttributeRequirementsConvertedToIntelligence", "BASE", 0) / 100
local strConversion = calcLocal(baseList, "AttributeRequirementsConvertedToStrength", "BASE", 0) / 100
local dexConversion = calcLocal(baseList, "AttributeRequirementsConvertedToDexterity", "BASE", 0) / 100
local intConversion = calcLocal(baseList, "AttributeRequirementsConvertedToIntelligence", "BASE", 0) / 100
self.requirements.intBase = intConversion * (self.requirements.str + self.requirements.dex) + (self.requirements.int + calcLocal(baseList, "IntRequirement", "BASE", 0)) - self.requirements.int * (strConversion + dexConversion)
self.requirements.intMod = m_floor(self.requirements.intBase * (1 + calcLocal(baseList, "IntRequirement", "INC", 0) / 100))
self.requirements.dexBase = dexConversion * (self.requirements.str + self.requirements.int) + (self.requirements.dex + calcLocal(baseList, "DexRequirement", "BASE", 0)) - self.requirements.dex * (strConversion + intConversion)
Expand Down
Loading
Loading