Skip to content

Commit c5e55b7

Browse files
NostrademousNostrademous
authored
Against the Darkness - Implemented (#155)
* Working Generated Variants * fixed a GGG spelling issue
1 parent 84a92a8 commit c5e55b7

File tree

3 files changed

+63
-45
lines changed

3 files changed

+63
-45
lines changed

‎src/Data/ModCache.lua

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2721,29 +2721,6 @@ c["Moving while Bleeding doesn't cause you to take extra damage"]={nil,"Moving w
27212721
c["Never deal Critical Hits"]={{[1]={flags=0,keywordFlags=0,name="NeverCrit",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="Condition:NeverCrit",type="FLAG",value=true}},nil}
27222722
c["No Chance to Block"]={{[1]={flags=0,keywordFlags=0,name="ArmourData",type="LIST",value={key="BlockChance",value=0}}},nil}
27232723
c["No Movement Speed Penalty while Shield is Raised"]={nil,"No Movement Speed Penalty while Shield is Raised "}
2724-
c["Notable Passive Skills in Radius also grant +1% to Maximum Chaos Resistance"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Chaos Resistance "}
2725-
c["Notable Passive Skills in Radius also grant +1% to Maximum Chaos Resistance Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Chaos Damage"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Chaos Resistance Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Chaos Damage "}
2726-
c["Notable Passive Skills in Radius also grant +1% to Maximum Cold Resistance"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Cold Resistance "}
2727-
c["Notable Passive Skills in Radius also grant +1% to Maximum Cold Resistance Small Passive Skills in Radius also grant 6% reduced Shock duration on you"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Cold Resistance Small Passive Skills in Radius also grant 6% reduced Shock duration on you "}
2728-
c["Notable Passive Skills in Radius also grant +1% to Maximum Fire Resistance"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Fire Resistance "}
2729-
c["Notable Passive Skills in Radius also grant +1% to Maximum Fire Resistance Small Passive Skills in Radius also grant 6% reduced Ignite Duration on you"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Fire Resistance Small Passive Skills in Radius also grant 6% reduced Ignite Duration on you "}
2730-
c["Notable Passive Skills in Radius also grant +1% to Maximum Lightning Resistance"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Lightning Resistance "}
2731-
c["Notable Passive Skills in Radius also grant +1% to Maximum Lightning Resistance Small Passive Skills in Radius also grant 1% increased maximum Mana"]={nil,"Notable Passive Skills in Radius also grant +1% to Maximum Lightning Resistance Small Passive Skills in Radius also grant 1% increased maximum Mana "}
2732-
c["Notable Passive Skills in Radius also grant +12 to Spirit"]={nil,"Notable Passive Skills in Radius also grant +12 to Spirit "}
2733-
c["Notable Passive Skills in Radius also grant +12 to Spirit Small Passive Skills in Radius also grant +4% to Cold Resistance"]={nil,"Notable Passive Skills in Radius also grant +12 to Spirit Small Passive Skills in Radius also grant +4% to Cold Resistance "}
2734-
c["Notable Passive Skills in Radius also grant 4% increased Dexterity"]={nil,"Notable Passive Skills in Radius also grant 4% increased Dexterity "}
2735-
c["Notable Passive Skills in Radius also grant 4% increased Dexterity Notable Passive Skills in Radius also grant +1% to Maximum Chaos Resistance"]={nil,"Notable Passive Skills in Radius also grant 4% increased Dexterity Notable Passive Skills in Radius also grant +1% to Maximum Chaos Resistance "}
2736-
c["Notable Passive Skills in Radius also grant 4% increased Intelligence"]={nil,"Notable Passive Skills in Radius also grant 4% increased Intelligence "}
2737-
c["Notable Passive Skills in Radius also grant 4% increased Intelligence Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Lightning Damage"]={nil,"Notable Passive Skills in Radius also grant 4% increased Intelligence Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Lightning Damage "}
2738-
c["Notable Passive Skills in Radius also grant 4% increased Strength"]={nil,"Notable Passive Skills in Radius also grant 4% increased Strength "}
2739-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Chaos Damage"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Chaos Damage "}
2740-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Chaos Damage Small Passive Skills in Radius also grant +4% to Fire Resistance"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Chaos Damage Small Passive Skills in Radius also grant +4% to Fire Resistance "}
2741-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Cold Damage"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Cold Damage "}
2742-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Cold Damage Notable Passive Skills in Radius also grant 4% increased Intelligence"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Cold Damage Notable Passive Skills in Radius also grant 4% increased Intelligence "}
2743-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Fire Damage"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Fire Damage "}
2744-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Fire Damage Small Passive Skills in Radius also grant 6% reduced Freeze Duration on you"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Fire Damage Small Passive Skills in Radius also grant 6% reduced Freeze Duration on you "}
2745-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Lightning Damage"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Lightning Damage "}
2746-
c["Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Lightning Damage Notable Passive Skills in Radius also grant 4% increased Dexterity"]={nil,"Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Lightning Damage Notable Passive Skills in Radius also grant 4% increased Dexterity "}
27472724
c["Offering Skills have 20% increased Area of Effect"]={nil,"Offering Skills have 20% increased Area of Effect "}
27482725
c["Offering Skills have 30% increased Duration"]={{[1]={[1]={skillNameList={[1]="Bone Offering",[2]="Flesh Offering",[3]="Spirit Offering",[4]="Blood Offering"},type="SkillName"},flags=0,keywordFlags=0,name="Duration",type="INC",value=30}},nil}
27492726
c["Offering Skills have 30% reduced Duration"]={{[1]={[1]={skillNameList={[1]="Bone Offering",[2]="Flesh Offering",[3]="Spirit Offering",[4]="Blood Offering"},type="SkillName"},flags=0,keywordFlags=0,name="Duration",type="INC",value=-30}},nil}
@@ -2900,21 +2877,6 @@ c["Skills reserve 50% less Spirit"]={nil,"Skills reserve 50% less Spirit "}
29002877
c["Skills that would Summon a Totem have 20% chance to Summon two Totems instead"]={nil,"Skills that would Summon a Totem have 20% chance to Summon two Totems instead "}
29012878
c["Slam Skills have 12% increased Area of Effect"]={nil,"Slam Skills have 12% increased Area of Effect "}
29022879
c["Slam Skills you use yourself cause Aftershocks"]={nil,"Slam Skills you use yourself cause Aftershocks "}
2903-
c["Small Passive Skills in Radius also grant +4% to Cold Resistance"]={nil,"Small Passive Skills in Radius also grant +4% to Cold Resistance "}
2904-
c["Small Passive Skills in Radius also grant +4% to Fire Resistance"]={nil,"Small Passive Skills in Radius also grant +4% to Fire Resistance "}
2905-
c["Small Passive Skills in Radius also grant +4% to Fire Resistance Notable Passive Skills in Radius also grant +1% to Maximum Cold Resistance"]={nil,"Small Passive Skills in Radius also grant +4% to Fire Resistance Notable Passive Skills in Radius also grant +1% to Maximum Cold Resistance "}
2906-
c["Small Passive Skills in Radius also grant +4% to Lightning Resistance"]={nil,"Small Passive Skills in Radius also grant +4% to Lightning Resistance "}
2907-
c["Small Passive Skills in Radius also grant +4% to Lightning Resistance Notable Passive Skills in Radius also grant 4% increased Strength"]={nil,"Small Passive Skills in Radius also grant +4% to Lightning Resistance Notable Passive Skills in Radius also grant 4% increased Strength "}
2908-
c["Small Passive Skills in Radius also grant 1% increased maximum Life"]={nil,"Small Passive Skills in Radius also grant 1% increased maximum Life "}
2909-
c["Small Passive Skills in Radius also grant 1% increased maximum Life Notable Passive Skills in Radius also grant +12 to Spirit"]={nil,"Small Passive Skills in Radius also grant 1% increased maximum Life Notable Passive Skills in Radius also grant +12 to Spirit "}
2910-
c["Small Passive Skills in Radius also grant 1% increased maximum Mana"]={nil,"Small Passive Skills in Radius also grant 1% increased maximum Mana "}
2911-
c["Small Passive Skills in Radius also grant 1% increased maximum Mana Small Passive Skills in Radius also grant +4% to Lightning Resistance"]={nil,"Small Passive Skills in Radius also grant 1% increased maximum Mana Small Passive Skills in Radius also grant +4% to Lightning Resistance "}
2912-
c["Small Passive Skills in Radius also grant 6% reduced Freeze Duration on you"]={nil,"Small Passive Skills in Radius also grant 6% reduced Freeze Duration on you "}
2913-
c["Small Passive Skills in Radius also grant 6% reduced Freeze Duration on you Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Cold Damage"]={nil,"Small Passive Skills in Radius also grant 6% reduced Freeze Duration on you Notable Passive Skills in Radius also grant Gain 4% of Damage as Extra Cold Damage "}
2914-
c["Small Passive Skills in Radius also grant 6% reduced Ignite Duration on you"]={nil,"Small Passive Skills in Radius also grant 6% reduced Ignite Duration on you "}
2915-
c["Small Passive Skills in Radius also grant 6% reduced Ignite Duration on you Small Passive Skills in Radius also grant 1% increased maximum Life"]={nil,"Small Passive Skills in Radius also grant 6% reduced Ignite Duration on you Small Passive Skills in Radius also grant 1% increased maximum Life "}
2916-
c["Small Passive Skills in Radius also grant 6% reduced Shock duration on you"]={nil,"Small Passive Skills in Radius also grant 6% reduced Shock duration on you "}
2917-
c["Small Passive Skills in Radius also grant 6% reduced Shock duration on you Notable Passive Skills in Radius also grant +1% to Maximum Lightning Resistance"]={nil,"Small Passive Skills in Radius also grant 6% reduced Shock duration on you Notable Passive Skills in Radius also grant +1% to Maximum Lightning Resistance "}
29182880
c["Sorcery Ward recovers 50% faster"]={nil,"recovers 50% faster "}
29192881
c["Spell Skills have 10% reduced Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=-10}},nil}
29202882
c["Spell Skills have 12% increased Area of Effect"]={{[1]={flags=0,keywordFlags=131072,name="AreaOfEffect",type="INC",value=12}},nil}

‎src/Data/Uniques/Special/Generated.lua

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,32 @@ do
1616
for modName, mod in pairs(uniqueMods) do
1717
local name = modName:match("^UniqueJewelRadius(.+)$")
1818
if name then
19-
table.insert(againstMods, { mod = mod, name = name:gsub("[%u%d]", " %1"):gsub("_", ""):gsub("E S", "ES") })
19+
table.insert(againstMods, { mod = mod, name = name:gsub("UniqueJewelRadius", ""):gsub("Strenth", "Strength") })
2020
end
2121
end
22-
table.sort(uniqueMods, function(a, b) return a.mod.statOrder[1] > b.mod.statOrder[1] end)
22+
table.sort(againstMods, function(a, b) return a.mod.statOrder[1] > b.mod.statOrder[1] end)
2323
local against = {
2424
"Against the Darkness",
2525
"Time-Lost Diamond",
2626
"Limited to: 1",
27-
"Radius: Large",
2827
"Has Alt Variant: true",
29-
"Selected Variant: 1",
30-
"Selected Alt Variant: 2",
3128
}
3229
for _, mod in ipairs(againstMods) do
33-
table.insert(against, "Variant:" .. mod.name)
30+
table.insert(against, "Variant: " .. mod.name)
3431
end
32+
local variantCount = #against
33+
table.insert(against, "Selected Variant: 1")
34+
table.insert(against, "Selected Alt Variant: 2")
35+
table.insert(against, "Radius: Large")
36+
table.insert(against, "Implicits: 0")
3537
local smallLine = "Small Passive Skills in Radius also grant "
3638
local notableLine = "Notable Passive Skills in Radius also grant "
3739
for index, mod in ipairs(againstMods) do
38-
table.insert(against, "{variant:" .. index .. "}" .. (mod.mod.nodeType == 1 and smallLine or notableLine) .. mod.mod[1])
40+
if mod.mod.nodeType == 1 then
41+
table.insert(against, "{variant:" .. index .. "," .. variantCount .. "}" .. smallLine .. mod.mod[1])
42+
else
43+
table.insert(against, "{variant:" .. index .. "," .. variantCount .. "}" .. notableLine .. mod.mod[1])
44+
end
3945
end
4046
table.insert(data.uniques.generated, table.concat(against, "\n"))
4147
end

‎src/Modules/ModParser.lua

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5497,6 +5497,56 @@ local jewelOtherFuncs = {
54975497
out:NewMod("NodeModifier", "LIST", { mod = mod("MinionModifier", "LIST", { mod = mod("MovementSpeed", "INC", -25, data.modSource) }) }, data.modSource)
54985498
end
54995499
end,
5500+
["Notable Passive Skills in Radius also grant %+(%d+)%% to Maximum (%a+) Resistance"] = function(num, type)
5501+
return function(node, out, data)
5502+
if node and node.type == "Notable" then
5503+
out:NewMod(firstToUpper(type).."ResistMax", "BASE", num, data.modSource)
5504+
end
5505+
end
5506+
end,
5507+
["Notable Passive Skills in Radius also grant (%d+)%% increased (%a+)"] = function(num, type)
5508+
return function(node, out, data)
5509+
if node and node.type == "Notable" then
5510+
-- take first 3 letters of attribute: Int, Str, Dex
5511+
out:NewMod(firstToUpper(type):sub(1, 3), "INC", num, data.modSource)
5512+
end
5513+
end
5514+
end,
5515+
["Notable Passive Skills in Radius also grant Gain (%d+)%% of Damage as Extra (%a+) Damage"] = function(num, type)
5516+
return function(node, out, data)
5517+
if node and node.type == "Notable" then
5518+
out:NewMod("GainAs"..type, "BASE", num, data.modSource)
5519+
end
5520+
end
5521+
end,
5522+
["Notable Passive Skills in Radius also grant %+(%d+) to Spirit"] = function(num)
5523+
return function(node, out, data)
5524+
if node and node.type == "Notable" then
5525+
out:NewMod("Spirit", "BASE", num, data.modSource)
5526+
end
5527+
end
5528+
end,
5529+
["Small Passive Skills in Radius also grant %+(%d+)%% to (%a+) Resistance"] = function(num, type)
5530+
return function(node, out, data)
5531+
if node and node.type == "Normal" then
5532+
out:NewMod(firstToUpper(type).."Resist", "BASE", num, data.modSource)
5533+
end
5534+
end
5535+
end,
5536+
["Small Passive Skills in Radius also grant (%d+)%% increased maximum (%a+)"] = function(num, type)
5537+
return function(node, out, data)
5538+
if node and node.type == "Normal" then
5539+
out:NewMod(firstToUpper(type), "INC", num, data.modSource)
5540+
end
5541+
end
5542+
end,
5543+
["Small Passive Skills in Radius also grant (%d+)%% reduced (%a+) Duration on you"] = function(num, type)
5544+
return function(node, out, data)
5545+
if node and node.type == "Normal" then
5546+
out:NewMod("Self"..firstToUpper(type).."Duration", "INC", num, data.modSource)
5547+
end
5548+
end
5549+
end,
55005550
}
55015551

55025552
-- Radius jewels that modify the jewel itself based on nearby allocated nodes

0 commit comments

Comments
 (0)