Skip to content

Fix local gain on hit #6130

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

Merged
merged 1 commit into from
Apr 27, 2023
Merged

Fix local gain on hit #6130

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
22 changes: 13 additions & 9 deletions src/Modules/ModParser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ local formList = {
["^you gain ([%d%.]+)"] = "GAIN",
["^gains? ([%d%.]+)%% of"] = "GAIN",
["^gain ([%d%.]+)"] = "GAIN",
["^grants ([%d%.]+)"] = "GRANTS",
["^removes? ([%d%.]+)%% of"] = "REMOVES",
["^gain %+(%d+)%% to"] = "GAIN",
["^you lose ([%d%.]+)"] = "LOSE",
["^loses? ([%d%.]+)%% of"] = "LOSE",
["^lose ([%d%.]+)"] = "LOSE",
["^lose %+(%d+)%% to"] = "LOSE",
["^grants ([%d%.]+)"] = "GRANTS", -- local
["^removes? ([%d%.]+) ?o?f? ?y?o?u?r?"] = "REMOVES", -- local
["^(%d+)"] = "BASE",
["^([%+%-]?%d+)%% chance"] = "CHANCE",
["^([%+%-]?%d+)%% chance to gain "] = "FLAG",
Expand Down Expand Up @@ -3500,6 +3500,7 @@ local specialModList = {
["gain (%d+) life per cursed enemy hit with attacks"] = function(num) return { mod("LifeOnHit", "BASE", num, nil, bor(ModFlag.Attack, ModFlag.Hit), { type = "ActorCondition", actor = "enemy", var = "Cursed" }) } end,
["(%d+) mana gained for each cursed enemy hit by your attacks"] = function(num) return { mod("ManaOnHit", "BASE", num, nil, bor(ModFlag.Attack, ModFlag.Hit), { type = "ActorCondition", actor = "enemy", var = "Cursed" }) } end,
["gain (%d+) mana per cursed enemy hit with attacks"] = function(num) return { mod("ManaOnHit", "BASE", num, nil, bor(ModFlag.Attack, ModFlag.Hit), { type = "ActorCondition", actor = "enemy", var = "Cursed" }) } end,
["gain (%d+) life per blinded enemy hit with this weapon"] = function(num) return { mod("LifeOnHit", "BASE", num, nil, ModFlag.Hit,{ type = "ActorCondition", actor = "enemy", var = "Blinded" }, { type = "Condition", var = "{Hand}Attack" }) } end,
["recover (%d+)%% of life on kill"] = function(num) return { mod("LifeOnKill", "BASE", 1, { type = "PercentStat", stat = "Life", percent = num }) } end,
["recover (%d+)%% of life on kill for each different type of mastery you have allocated"] = function(num) return { mod("LifeOnKill", "BASE", 1, { type = "PercentStat", stat = "Life", percent = num }, { type = "Multiplier", var = "AllocatedMasteryType" }) } end,
["recover (%d+)%% of life on killing a poisoned enemy"] = function(num) return { mod("LifeOnKill", "BASE", 1, { type = "PercentStat", stat = "Life", percent = num }, { type = "MultiplierThreshold", actor = "enemy", var = "PoisonStack", threshold = 1 }) } end,
Expand Down Expand Up @@ -5018,6 +5019,7 @@ local function parseMod(line, order)
local modValue = tonumber(formCap[1]) or formCap[1]
local modType = "BASE"
local modSuffix
local modExtraTags
if modForm == "INC" then
modType = "INC"
elseif modForm == "RED" then
Expand All @@ -5033,18 +5035,20 @@ local function parseMod(line, order)
elseif modForm == "GAIN" then
modType = "BASE"
modSuffix, line = scan(line, suffixTypes, true)
elseif modForm == "GRANTS" then
elseif modForm == "LOSE" then
modValue = -modValue
modType = "BASE"
modFlag = modFlag or { keywordFlags = KeywordFlag.Attack }
modSuffix, line = scan(line, suffixTypes, true)
elseif modForm == "REMOVES" then
modValue = -modValue
elseif modForm == "GRANTS" then -- local
modType = "BASE"
modFlag = modFlag or { keywordFlags = KeywordFlag.Attack }
modFlag = modFlag
modExtraTags = { tag = { type = "Condition", var = "{Hand}Attack" } }
modSuffix, line = scan(line, suffixTypes, true)
elseif modForm == "LOSE" then
elseif modForm == "REMOVES" then -- local
modValue = -modValue
modType = "BASE"
modFlag = modFlag
modExtraTags = { tag = { type = "Condition", var = "{Hand}Attack" } }
modSuffix, line = scan(line, suffixTypes, true)
elseif modForm == "CHANCE" then
elseif modForm == "REGENPERCENT" then
Expand Down Expand Up @@ -5111,7 +5115,7 @@ local function parseMod(line, order)
local keywordFlags = 0
local tagList = { }
local misc = { }
for _, data in pairs({ modName, preFlag, modFlag, modTag, modTag2, skillTag }) do
for _, data in pairs({ modName, preFlag, modFlag, modTag, modTag2, skillTag, modExtraTags }) do
if type(data) == "table" then
flags = bor(flags, data.flags or 0)
keywordFlags = bor(keywordFlags, data.keywordFlags or 0)
Expand Down