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
1 change: 1 addition & 0 deletions src/Data/ModCache.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6849,6 +6849,7 @@ c["Unique Tamed Beasts have 30% increased movement speed"]={nil,"Unique Tamed Be
c["Unique Tamed Beasts have 30% increased movement speed Unique Tamed Beasts are Possessed by random Azmeri Spirits, changing every 20 seconds"]={nil,"Unique Tamed Beasts have 30% increased movement speed Unique Tamed Beasts are Possessed by random Azmeri Spirits, changing every 20 seconds "}
c["Unwavering Stance"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Unwavering Stance"}},nil}
c["Unwithered enemies are Withered for 8 seconds when they enter your Presence"]={{[1]={flags=0,keywordFlags=0,name="Condition:CanWither",type="FLAG",value=true}},nil}
c["Upgrades Radius to Very Large"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="timeLostJewelRadiusOverride",value=4}}},nil}
c["Used when you are affected by a Slow"]={nil,"Used when you are affected by a Slow "}
c["Used when you are affected by a Slow Grants Onslaught during effect"]={nil,"Used when you are affected by a Slow Grants Onslaught during effect "}
c["Used when you become Frozen"]={nil,"Used when you become Frozen "}
Expand Down
34 changes: 20 additions & 14 deletions src/Modules/ModParser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7019,29 +7019,35 @@ local jewelOtherFuncs = {
["^(%w+) Passive Skills in Radius also grant (.*)$"] = function(passiveType, mod)
return function(node, out, data)
if node and (node.type == firstToUpper(passiveType) or (node.type == "Normal" and not node.isAttribute and firstToUpper(passiveType) == "Small")) then
local modList, line = parseMod(mod)
if not line and modList[1] then -- something failed to parse, do not add to list
modList[1].parsedLine = capitalizeWordsInString(mod)
modList[1].source = data.modSource
if type(modList[1].value) == "table" and modList[1].value.mod then
modList[1].value.mod.source = data.modSource
local modList, extra = parseMod(mod)
-- avoid adding mods if mod line wasn't parsed correctly
if not extra and modList[1] then
for _, modListMod in ipairs(modList) do
modListMod.parsedLine = capitalizeWordsInString(mod)
modListMod.source = data.modSource
if type(modListMod.value) == "table" and modListMod.value.mod then
modListMod.value.mod.source = data.modSource
end
out:AddMod(modListMod)
end
out:AddMod(modList[1])
end
end
end
end,
["conquered (%w+) Passive Skills also grant (.*)$"] = function(passiveType, mod)
return function(node, out, data)
if node and (node.type == firstToUpper(passiveType) or (node.type == "Normal" and not node.isAttribute and firstToUpper(passiveType) == "Small") or (node.type == "Normal" and node.isAttribute and firstToUpper(passiveType) == "Attribute")) then
local modList, line = parseMod(mod)
if not line and modList[1] then -- something failed to parse, do not add to list
modList[1].parsedLine = capitalizeWordsInString(mod)
modList[1].source = data.modSource
if type(modList[1].value) == "table" and modList[1].value.mod then
modList[1].value.mod.source = data.modSource
local modList, extra = parseMod(mod)
-- avoid adding mods if mod line wasn't parsed correctly
if not extra and modList[1] then
for _, modListMod in ipairs(modList) do
modListMod.parsedLine = capitalizeWordsInString(mod)
modListMod.source = data.modSource
if type(modListMod.value) == "table" and modListMod.value.mod then
modListMod.value.mod.source = data.modSource
end
out:AddMod(modListMod)
end
out:AddMod(modList[1])
end
end
end
Expand Down
Loading