Skip to content
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

Jump to bottom

Heist modifier magnitudes #8269

Draft
wants to merge 11 commits into
base: dev
Choose a base branch
from
Draft

Heist modifier magnitudes #8269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c9479d1
make local tincture effect multiplicative
Regisle Aug 8, 2024
6d4680c
WIP scale explicits
Regisle Aug 8, 2024
8c474ba
change catalyst scalar into generic range scalar function
Regisle Aug 9, 2024
090822e
pre-process mods to get effect
Regisle Aug 11, 2024
231a1a2
fix spelling
Regisle Aug 13, 2024
89ed929
fix suffixes, making them not be needed to export
Regisle Aug 20, 2024
099ec7a
fix remaining conprint
Regisle Aug 21, 2024
b4225b5
make function more generic
Regisle Aug 30, 2024
1328cc7
remove function as its getting to be more effort than it helps
Regisle Aug 30, 2024
8d7119a
dont check for local effect on non tincture items
Regisle Aug 30, 2024
25f2d1f
initial draft of heist implicts and enchants
Regisle Aug 30, 2024
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
242 changes: 194 additions & 48 deletions src/Classes/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,18 @@
local dmgTypeList = {"Physical", "Lightning", "Cold", "Fire", "Chaos"}
local catalystList = {"Abrasive", "Accelerating", "Fertile", "Imbued", "Intrinsic", "Noxious", "Prismatic", "Tempering", "Turbulent", "Unstable"}
local catalystTags = {
{ "attack" },
{ "speed" },
{ "life", "mana", "resource" },
{ "caster" },
{ "jewellery_attribute", "attribute" },
{ "physical_damage", "chaos_damage" },
{ "jewellery_resistance", "resistance" },
{ "jewellery_defense", "defences" },
{ "jewellery_elemental" ,"elemental_damage" },
{ "critical" },
{ attack = true },
{ speed = true },
{ life = true, mana = true, resource = true },
{ caster = true },
{ jewellery_attribute = true, attribute = true },
{ physical_damage = true, chaos_damage = true },
{ jewellery_resistance = true, resistance = true },
{ jewellery_defense = true, defences = true },
{ jewellery_elemental = true ,elemental_damage = true },
{ critical = true },
}

local function getCatalystScalar(catalystId, tags, quality)
if not catalystId or type(catalystId) ~= "number" or not catalystTags[catalystId] or not tags or type(tags) ~= "table" or #tags == 0 then
return 1
end
if not quality then
quality = 20
end

-- Create a fast lookup table for all provided tags
local tagLookup = {}
for _, curTag in ipairs(tags) do
tagLookup[curTag] = true;
end

-- Find if any of the catalyst's tags match the provided tags
for _, catalystTag in ipairs(catalystTags[catalystId]) do
if tagLookup[catalystTag] then
return (100 + quality) / 100
end
end
return 1
end

local influenceInfo = itemLib.influenceInfo

local ItemClass = newClass("Item", function(self, raw, rarity, highQuality)
Expand Down Expand Up @@ -342,6 +319,18 @@
l = l + 1
end
end
-- preprocess looking for modifier effect multipliers
local modLineMultipliers = {}
for _, line in ipairs(self.rawLines) do
if line:find("Modifier magnitudes") then
local tag = line:match("ed Explicit (%a+) Modifier magnitudes") or (line:match("ed Suffix Modifier magnitudes") and "Suffix") or (line:match("ed Prefix Modifier magnitudes") and "Prefix") or "AllExplicit"
local value = (line:match("^(%d+)%% increased ") or 0) - (line:match("^(%d+)%% reduced ") or 0)
modLineMultipliers[tag] = (modLineMultipliers[tag] or 0) + value
elseif line:find("effect") then
modLineMultipliers["localEffect"] = (modLineMultipliers["localEffect"] or 0) + (line:match("^(%d+)%% increased effect") or 0) - (line:match("^(%d+)%% reduced effect") or 0)
end
end

self.checkSection = false
self.sockets = { }
self.classRequirementModLines = { }
Expand Down Expand Up @@ -721,14 +710,48 @@
foundImplicit = true
gameModeStage = "IMPLICIT"
end
local catalystScalar = getCatalystScalar(self.catalyst, modLine.modTags, self.catalystQuality)
local rangedLine = itemLib.applyRange(line, 1, catalystScalar)
local rangeScalar = 1
if self.catalyst and catalystTags[self.catalyst] then
for _, curTag in ipairs(modLine.modTags) do
if catalystTags[self.catalyst][curTag] then
rangeScalar = (100 + self.catalystQuality) / 100
break
end
end
elseif self.base.tincture then
for _, curTag in ipairs(modLine.modTags) do
if curTag == "tincture" then
rangeScalar = (100 + (modLineMultipliers["localEffect"] or 0)) / 100 * (100 + (self.quality or 20)) / 100
break
end
end
end
if not self.base.tincture and gameModeStage == "EXPLICIT" then
for searchTag, mult in pairs(modLineMultipliers) do
if searchTag == "AllExplicit" then
-- this was still matching implicts

Check warning on line 732 in src/Classes/Item.lua

View workflow job for this annotation

GitHub Actions / spellcheck 

Unknown word (implicts)
if line:match("Modifier") then
break
else
rangeScalar = rangeScalar * (100 + mult) / 100
end
elseif searchTag ~= "localEffect" then
for _, curTag in ipairs(modLine.modTags) do
if curTag == searchTag:lower() then
rangeScalar = rangeScalar * (100 + mult) / 100
break
end
end
end
end
end
local rangedLine = itemLib.applyRange(line, 1, rangeScalar)
local modList, extra = modLib.parseMod(rangedLine)
if (not modList or extra) and self.rawLines[l+1] then
-- Try to combine it with the next line
local nextLine = self.rawLines[l+1]:gsub("%b{}", ""):gsub(" ?%(%l+%)","")
local combLine = line.." "..nextLine
rangedLine = itemLib.applyRange(combLine, 1, catalystScalar)
rangedLine = itemLib.applyRange(combLine, 1, rangeScalar)
modList, extra = modLib.parseMod(rangedLine, true)
if modList and not extra then
line = line.."\n"..nextLine
Expand Down Expand Up @@ -778,7 +801,7 @@
if modList then
modLine.modList = modList
modLine.extra = extra
modLine.valueScalar = catalystScalar
modLine.valueScalar = rangeScalar
modLine.range = modLine.range or main.defaultItemAffixQuality
t_insert(modLines, modLine)
if mode == "GAME" then
Expand Down Expand Up @@ -1163,6 +1186,44 @@
self.nameSuffix = ""
self.requirements.level = self.base.req.level
local statOrder = { }
-- preprocess looking for modifier effect multipliers
local modLineMultipliers = {}
if self.base.tincture then
for _, list in ipairs({self.prefixes,self.suffixes}) do
for _, affix in ipairs(list) do
local mod = self.affixes[affix.modId]
if mod then
for _, line in ipairs(mod) do
if line:find("effect") then
line = itemLib.applyRange(line, affix.range or 0.5, nil)
modLineMultipliers["localEffect"] = (modLineMultipliers["localEffect"] or 0) + (line:match("^(%d+)%% increased effect") or 0) - (line:match("^(%d+)%% reduced effect") or 0)
end
end
end
end
end
else
if self.base.type == "Ring" or self.base.type == "Amulet" then
for _, modLine in ipairs(self.implicitModLines) do
if modLine.line:find("Modifier magnitudes") then
local tag = modLine.line:match("ed Explicit (%a+) Modifier magnitudes") or (modLine.line:match("ed Suffix Modifier magnitudes") and "Suffix") or (modLine.line:match("ed Prefix Modifier magnitudes") and "Prefix") or "AllExplicit"
local value = (modLine.line:match("^(%d+)%% increased ") or 0) - (modLine.line:match("^(%d+)%% reduced ") or 0)
modLineMultipliers[tag] = (modLineMultipliers[tag] or 0) + value
end
end
end
for _, modLine in ipairs(self.enchantModLines) do
if modLine.line:find("Modifier magnitudes") then
if modLine.line:find("increased") then
local value, tag = modLine.line:match("^(%d+)%% increased Explicit (%a+) Modifier magnitudes")
modLineMultipliers[tag] = (modLineMultipliers[tag] or 0) + (value or 0)
else
local value, tag = modLine.line:match("^(%d+)%% reduced Explicit (%a+) Modifier magnitudes")
modLineMultipliers[tag] = (modLineMultipliers[tag] or 0) - (value or 0)
end
end
end
end
for _, list in ipairs({self.prefixes,self.suffixes}) do
for i = 1, self.affixLimit / 2 do
local affix = list[i]
Expand All @@ -1176,8 +1237,34 @@
elseif mod.type == "Suffix" then
self.nameSuffix = " " .. mod.affix
end
self.requirements.level = m_max(self.requirements.level or 0, m_floor(mod.level * 0.8))
local rangeScalar = getCatalystScalar(self.catalyst, mod.modTags, self.catalystQuality)
self.requirements.level = m_max(self.requirements.level or 0, m_floor(mod.level * 0.8))
local rangeScalar = 1
if self.catalyst and catalystTags[self.catalyst] then
for _, curTag in ipairs(mod.modTags) do
if catalystTags[self.catalyst][curTag] then
rangeScalar = (100 + self.catalystQuality) / 100
break
end
end
elseif self.base.tincture and mod.type == "Suffix" then
rangeScalar = (100 + (modLineMultipliers["localEffect"] or 0)) / 100 * (100 + (self.quality or 20)) / 100
end
if not self.base.tincture then
for searchTag, mult in pairs(modLineMultipliers) do
if searchTag == "AllExplicit" then
--rangeScalar = rangeScalar * (100 + mult) / 100
elseif searchTag == mod.type then
rangeScalar = rangeScalar * (100 + mult) / 100
else
-- for _, curTag in ipairs(mod.modTags) do
-- if curTag == searchTag:lower() then
-- rangeScalar = rangeScalar * (100 + mult) / 100
-- break
-- end
-- end
end
end
end
for i, line in ipairs(mod) do
line = itemLib.applyRange(line, affix.range or 0.5, rangeScalar)
local order = mod.statOrder[i]
Expand Down Expand Up @@ -1569,7 +1656,37 @@
end
end
end
local function processModLine(modLine)
-- preprocess looking for modifier effect multipliers
local modLineMultipliers = {}
if self.base.tincture then
for _, modLine in ipairs(self.explicitModLines) do
if modLine.line:find("effect") then
modLineMultipliers["localEffect"] = (modLineMultipliers["localEffect"] or 0) + (modLine.line:match("^(%d+)%% increased effect") or 0) - (modLine.line:match("^(%d+)%% reduced effect") or 0)
end
end
else
if self.base.type == "Ring" or self.base.type == "Amulet" then
for _, modLine in ipairs(self.implicitModLines) do
if modLine.line:find("Modifier magnitudes") then
local tag = modLine.line:match("ed Explicit (%a+) Modifier magnitudes") or "AllExplicit"
local value = (modLine.line:match("^(%d+)%% increased Explicit ") or 0) - (modLine.line:match("^(%d+)%% reduced Explicit ") or 0)
modLineMultipliers[tag] = (modLineMultipliers[tag] or 0) + value
end
end
end
for _, modLine in ipairs(self.enchantModLines) do
if modLine.line:find("Modifier magnitudes") then
if modLine.line:find("increased") then
local value, tag = modLine.line:match("^(%d+)%% increased Explicit (%a+) Modifier magnitudes")
modLineMultipliers[tag] = (modLineMultipliers[tag] or 0) + (value or 0)
else
local value, tag = modLine.line:match("^(%d+)%% reduced Explicit (%a+) Modifier magnitudes")
modLineMultipliers[tag] = (modLineMultipliers[tag] or 0) - (value or 0)
end
end
end
end
local function processModLine(modLine, lineType)
if self:CheckModLineVariant(modLine) then
-- special section for variant over-ride of pre-modifier item parameters
if modLine.line:find("Requires Class") then
Expand All @@ -1581,9 +1698,38 @@
-- Check if line actually has a range
if modLine.line:find("%((%-?%d+%.?%d*)%-(%-?%d+%.?%d*)%)") then
local strippedModeLine = modLine.line:gsub("\n"," ")
local catalystScalar = getCatalystScalar(self.catalyst, modLine.modTags, self.catalystQuality)
local rangeScalar = 1
if self.catalyst and catalystTags[self.catalyst] then
for _, curTag in ipairs(modLine.modTags) do
if catalystTags[self.catalyst][curTag] then
rangeScalar = (100 + self.catalystQuality) / 100
break
end
end
elseif self.base.tincture then
for _, curTag in ipairs(modLine.modTags) do
if curTag == "tincture" then
rangeScalar = (100 + (modLineMultipliers["localEffect"] or 0)) / 100 * (100 + (self.quality or 20)) / 100
break
end
end
end
if not self.base.tincture and lineType == "explicitModLines" then
for searchTag, mult in pairs(modLineMultipliers) do
if searchTag == "AllExplicit" then
rangeScalar = rangeScalar * (100 + mult) / 100
else
for _, curTag in ipairs(modLine.modTags) do
if curTag == searchTag:lower() then
rangeScalar = rangeScalar * (100 + mult) / 100
break
end
end
end
end
end
-- Put the modified value into the string
local line = itemLib.applyRange(strippedModeLine, modLine.range, catalystScalar)
local line = itemLib.applyRange(strippedModeLine, modLine.range, rangeScalar)
-- Check if we can parse it before adding the mods
local list, extra = modLib.parseMod(line)
if list and not extra then
Expand All @@ -1602,22 +1748,22 @@
end
end
end
for _, modLine in ipairs(self.enchantModLines) do
for _, modLine in ipairs(self.enchantModLines, "enchantModLines") do
processModLine(modLine)
end
for _, modLine in ipairs(self.scourgeModLines) do
for _, modLine in ipairs(self.scourgeModLines, "scourgeModLines") do
processModLine(modLine)
end
for _, modLine in ipairs(self.classRequirementModLines) do
for _, modLine in ipairs(self.classRequirementModLines, "classRequirementModLines") do
processModLine(modLine)
end
for _, modLine in ipairs(self.implicitModLines) do
for _, modLine in ipairs(self.implicitModLines, "implicitModLines") do
processModLine(modLine)
end
for _, modLine in ipairs(self.explicitModLines) do
for _, modLine in ipairs(self.explicitModLines, "explicitModLines") do
processModLine(modLine)
end
for _, modLine in ipairs(self.crucibleModLines) do
for _, modLine in ipairs(self.crucibleModLines, "crucibleModLines") do
processModLine(modLine)
end
if self.name == "Tabula Rasa, Simple Robe" or self.name == "Skin of the Loyal, Simple Robe" or self.name == "Skin of the Lords, Simple Robe" or self.name == "The Apostate, Cabalist Regalia" then
Expand Down
2 changes: 1 addition & 1 deletion src/Classes/ItemsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3649,7 +3649,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode)
if item.rarity == "MAGIC" then
effectInc = effectInc + modDB:Sum("INC", { actor = "player" }, "MagicTinctureEffect")
end
local effectMod = (1 + (tinctureData.effectInc + effectInc) / 100) * (1 + (item.quality or 0) / 100)
local effectMod = (1 + (effectInc) / 100)
if effectMod ~= 1 then
t_insert(stats, s_format("^8Tincture effect modifier: ^7%+d%%", effectMod * 100 - 100))
end
Expand Down
Loading
Loading