Skip to content

Commit b0d71b2

Browse files
author
LocalIdentity
committed
Fix Unending Hunger
1 parent af0bc4d commit b0d71b2

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

src/Data/ModCache.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12557,7 +12557,6 @@ c["With at least 40 Intelligence in Radius, Fireball Projectiles gain Area as th
1255712557
c["With at least 40 Intelligence in Radius, Frostbolt Projectiles gain 40% increased Projectile"]={nil,"With at least 40 Intelligence in Radius, Frostbolt Projectiles gain 40% increased Projectile "}
1255812558
c["With at least 40 Intelligence in Radius, Frostbolt Projectiles gain 40% increased Projectile Speed per second"]={nil,"With at least 40 Intelligence in Radius, Frostbolt Projectiles gain 40% increased Projectile Speed per second "}
1255912559
c["With at least 40 Intelligence in Radius, Raised"]={nil,"With at least 40 Intelligence in Radius, Raised "}
12560-
c["With at least 40 Intelligence in Radius, Raised Spectres have a 50% chance to gain Soul Eater for 20 seconds on Kill"]={nil,"With at least 40 Intelligence in Radius, Raised Spectres have a 50% chance to gain Soul Eater for 20 seconds on Kill "}
1256112560
c["With at least 40 Intelligence in Radius, Raised Zombies' Slam"]={nil,"With at least 40 Intelligence in Radius, Raised Zombies' Slam "}
1256212561
c["With at least 40 Intelligence in Radius, Rolling Magma"]={nil,"With at least 40 Intelligence in Radius, Rolling Magma "}
1256312562
c["With at least 40 Intelligence in Radius, Spark fires Projectiles in a Nova"]={nil,"With at least 40 Intelligence in Radius, Spark fires Projectiles in a Nova "}

src/Modules/ModParser.lua

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6208,6 +6208,10 @@ local jewelThresholdFuncs = {
62086208
["With at least 40 Intelligence in Radius, (%d+)%% of Damage taken Recouped as Mana if you've Warcried Recently"] = function(num) return getThreshold("Int", "ManaRecoup", "BASE", num, { type = "Condition", var = "UsedWarcryRecently" }) end,
62096209
["With at least 40 Intelligence in Radius, Fireball Projectiles gain Radius as they travel farther, up to %+(%d+) Radius"] = function(num) return getThreshold("Int", "AreaOfEffect", "BASE", num, { type = "DistanceRamp", ramp = {{0,0},{50,1}} }) end,
62106210
["With at least 40 Intelligence in Radius, Projectiles gain radius as they travel farther, up to a maximum of %+([%d%.]+) metres? to radius"] = function(num) return getThreshold("Int", "AreaOfEffect", "BASE", num * 10, { type = "DistanceRamp", ramp = {{0,0},{50,1}} }) end,
6211+
["With at least 40 Intelligence in Radius, Raised Spectres have a 50% chance to gain Soul Eater for 20 seconds on Kill"] = {
6212+
getThreshold("Int", "MinionModifier", "LIST", { mod = mod("Condition:CanHaveSoulEater", "FLAG", true) }, { type = "SkillName", skillName = "Raise Spectre", includeTransfigured = true }),
6213+
getThreshold("Int", "Condition:MinionCanHaveSoulEater", "FLAG", true),
6214+
},
62116215
-- [""] = getThreshold("", "", "", , { type = "SkillName", skillName = "" }),
62126216
}
62136217

@@ -6240,7 +6244,19 @@ for k, v in pairs(jewelSelfUnallocFuncs) do
62406244
end
62416245
-- Threshold Jewels
62426246
for k, v in pairs(jewelThresholdFuncs) do
6243-
jewelFuncList[k:lower()] = { func = v, type = "Threshold" }
6247+
if type(v) == "table" then
6248+
-- Allow one threshold line to apply multiple independent threshold funcs
6249+
jewelFuncList[k:lower()] = { func = function(node, out, data)
6250+
data.funcData = data.funcData or { }
6251+
for index, func in ipairs(v) do
6252+
data.funcData[index] = data.funcData[index] or { }
6253+
data.funcData[index].modSource = data.modSource
6254+
func(node, out, data.funcData[index])
6255+
end
6256+
end, type = "Threshold" }
6257+
else
6258+
jewelFuncList[k:lower()] = { func = v, type = "Threshold" }
6259+
end
62446260
end
62456261

62466262
-- Generate list of cluster jewel skills

0 commit comments

Comments
 (0)