Skip to content

Commit d713080

Browse files
PeecheyPeechey
committed
1 parent 2108651 commit d713080

File tree

2 files changed

+101
-13
lines changed

2 files changed

+101
-13
lines changed

‎src/Modules/ModParser.lua‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6525,22 +6525,36 @@ local jewelOtherFuncs = {
65256525
["Dexterity from Passives in Radius is Transformed to Intelligence"] = getSimpleConv({ "Dex" }, "Int", "BASE", true),
65266526
["Intelligence from Passives in Radius is Transformed to Dexterity"] = getSimpleConv({ "Int" }, "Dex", "BASE", true),
65276527
["Increases and Reductions to Life in Radius are Transformed to apply to Energy Shield"] = getSimpleConv({ "Life" }, "EnergyShield", "INC", true),
6528-
["Increases and Reductions to Energy Shield in Radius are Transformed to apply to Armour at 200% of their value"] = getSimpleConv({ "EnergyShield" }, "Armour", "INC", true, 2),
6529-
["Increases and Reductions to Life in Radius are Transformed to apply to Mana at 200% of their value"] = getSimpleConv({ "Life" }, "Mana", "INC", true, 2),
6528+
["Increases and Reductions to Energy Shield in Radius are Transformed to apply to Armour at (%d+)%% of their value"] = function(num)
6529+
return getSimpleConv({ "EnergyShield" }, "Armour", "INC", true, num / 100)
6530+
end,
6531+
["Increases and Reductions to Life in Radius are Transformed to apply to Mana at (%d+)%% of their value"] = function(num)
6532+
return getSimpleConv({ "Life" }, "Mana", "INC", true, num / 100)
6533+
end,
65306534
["Increases and Reductions to Physical Damage in Radius are Transformed to apply to Cold Damage"] = getSimpleConv({ "PhysicalDamage" }, "ColdDamage", "INC", true),
65316535
["Increases and Reductions to Cold Damage in Radius are Transformed to apply to Physical Damage"] = getSimpleConv({ "ColdDamage" }, "PhysicalDamage", "INC", true),
65326536
["Increases and Reductions to other Damage Types in Radius are Transformed to apply to Fire Damage"] = getSimpleConv({ "PhysicalDamage","ColdDamage","LightningDamage","ChaosDamage","ElementalDamage" }, "FireDamage", "INC", true),
6533-
["Passives granting Lightning Resistance or all Elemental Resistances in Radius also grant Chance to Block Spells at 35% of its value"] = getSimpleConv({ "LightningResist","ElementalResist" }, "SpellBlockChance", "BASE", false, 0.35),
6534-
["Passives granting Lightning Resistance or all Elemental Resistances in Radius also grant Chance to Block Spell Damage at 35% of its value"] = getSimpleConv({ "LightningResist","ElementalResist" }, "SpellBlockChance", "BASE", false, 0.35),
6535-
["Passives granting Lightning Resistance or all Elemental Resistances in Radius also grant Chance to Block Spell Damage at 50% of its value"] = getSimpleConv({ "LightningResist","ElementalResist" }, "SpellBlockChance", "BASE", false, 0.5),
6536-
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Dodge Attacks at 35% of its value"] = getSimpleConv({ "ColdResist","ElementalResist" }, "AttackDodgeChance", "BASE", false, 0.35),
6537-
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Dodge Attack Hits at 35% of its value"] = getSimpleConv({ "ColdResist","ElementalResist" }, "AttackDodgeChance", "BASE", false, 0.35),
6538-
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Suppress Spell Damage at 35% of its value"] = getSimpleConv({ "ColdResist","ElementalResist" }, "SpellSuppressionChance", "BASE", false, 0.35),
6539-
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Suppress Spell Damage at 50% of its value"] = getSimpleConv({ "ColdResist","ElementalResist" }, "SpellSuppressionChance", "BASE", false, 0.5),
6540-
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Suppress Spell Damage at 70% of its value"] = getSimpleConv({ "ColdResist","ElementalResist" }, "SpellSuppressionChance", "BASE", false, 0.7),
6541-
["Passives granting Fire Resistance or all Elemental Resistances in Radius also grant Chance to Block Attack Damage at 35% of its value"] = getSimpleConv({ "FireResist","ElementalResist" }, "BlockChance", "BASE", false, 0.35),
6542-
["Passives granting Fire Resistance or all Elemental Resistances in Radius also grant Chance to Block Attack Damage at 50% of its value"] = getSimpleConv({ "FireResist","ElementalResist" }, "BlockChance", "BASE", false, 0.5),
6543-
["Passives granting Fire Resistance or all Elemental Resistances in Radius also grant Chance to Block at 35% of its value"] = getSimpleConv({ "FireResist","ElementalResist" }, "BlockChance", "BASE", false, 0.35),
6537+
["Passives granting Lightning Resistance or all Elemental Resistances in Radius also grant Chance to Block Spells at (%d+)%% of its value"] = function(num)
6538+
return getSimpleConv({ "LightningResist","ElementalResist" }, "SpellBlockChance", "BASE", false, num / 100)
6539+
end,
6540+
["Passives granting Lightning Resistance or all Elemental Resistances in Radius also grant Chance to Block Spell Damage at (%d+)%% of its value"] = function(num)
6541+
return getSimpleConv({ "LightningResist","ElementalResist" }, "SpellBlockChance", "BASE", false, num / 100)
6542+
end,
6543+
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Dodge Attacks at (%d+)%% of its value"] = function(num)
6544+
return getSimpleConv({ "ColdResist","ElementalResist" }, "AttackDodgeChance", "BASE", false, num / 100)
6545+
end,
6546+
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Dodge Attack Hits at (%d+)%% of its value"] = function(num)
6547+
return getSimpleConv({ "ColdResist","ElementalResist" }, "AttackDodgeChance", "BASE", false, num / 100)
6548+
end,
6549+
["Passives granting Cold Resistance or all Elemental Resistances in Radius also grant Chance to Suppress Spell Damage at (%d+)%% of its value"] = function(num)
6550+
return getSimpleConv({ "ColdResist","ElementalResist" }, "SpellSuppressionChance", "BASE", false, num / 100)
6551+
end,
6552+
["Passives granting Fire Resistance or all Elemental Resistances in Radius also grant Chance to Block Attack Damage at (%d+)%% of its value"] = function(num)
6553+
return getSimpleConv({ "FireResist","ElementalResist" }, "BlockChance", "BASE", false, num / 100)
6554+
end,
6555+
["Passives granting Fire Resistance or all Elemental Resistances in Radius also grant Chance to Block at (%d+)%% of its value"] = function(num)
6556+
return getSimpleConv({ "FireResist","ElementalResist" }, "BlockChance", "BASE", false, num / 100)
6557+
end,
65446558
["Melee and Melee Weapon Type modifiers in Radius are Transformed to Bow Modifiers"] = function(node, out, data)
65456559
if node then
65466560
local mask1 = bor(ModFlag.Axe, ModFlag.Claw, ModFlag.Dagger, ModFlag.Mace, ModFlag.Staff, ModFlag.Sword, ModFlag.Melee)

‎src/Modules/ModParser.lua.rej‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
diff a/src/Modules/ModParser.lua b/src/Modules/ModParser.lua (rejected hunks)
2+
@@ -5656,9 +5670,11 @@ local jewelOtherFuncs = {
3+
end
4+
end
5+
end,
6+
- ["50% increased Effect of non-Keystone Passive Skills in Radius"] = function(node, out, data)
7+
- if node and node.type ~= "Keystone" and node.type ~= "ClassStart" then
8+
- out:NewMod("PassiveSkillEffect", "INC", 50, data.modSource)
9+
+ ["(%d+)%% increased Effect of non%-Keystone Passive Skills in Radius"] = function(num)
10+
+ return function(node, out, data)
11+
+ if node and node.type ~= "Keystone" and node.type ~= "ClassStart" then
12+
+ out:NewMod("PassiveSkillEffect", "INC", num, data.modSource)
13+
+ end
14+
end
15+
end,
16+
["Notable Passive Skills in Radius grant nothing"] = function(node, out, data)
17+
@@ -5666,9 +5682,11 @@ local jewelOtherFuncs = {
18+
out:NewMod("PassiveSkillHasNoEffect", "FLAG", true, data.modSource)
19+
end
20+
end,
21+
- ["100% increased effect of Tattoos in Radius"] = function(node, out, data)
22+
- if node and node.isTattoo then
23+
- out:NewMod("PassiveSkillEffect", "INC", 100, data.modSource)
24+
+ ["(%d+)%% increased effect of Tattoos in Radius"] = function(num)
25+
+ return function(node, out, data)
26+
+ if node and node.isTattoo then
27+
+ out:NewMod("PassiveSkillEffect", "INC", num, data.modSource)
28+
+ end
29+
end
30+
end,
31+
["Allocated Small Passive Skills in Radius grant nothing"] = function(node, out, data)
32+
@@ -5757,23 +5775,29 @@ local jewelOtherFuncs = {
33+
end
34+
end
35+
end,
36+
- ["Notable Passive Skills in Radius are Transformed to instead grant: 10% increased Mana Cost of Skills and 20% increased Spell Damage"] = function(node, out, data)
37+
- if node and node.type == "Notable" then
38+
- out:NewMod("PassiveSkillHasOtherEffect", "FLAG", true, data.modSource)
39+
- out:NewMod("NodeModifier", "LIST", { mod = mod("ManaCost", "INC", 10, data.modSource) }, data.modSource)
40+
- out:NewMod("NodeModifier", "LIST", { mod = mod("Damage", "INC", 20, data.modSource, ModFlag.Spell) }, data.modSource)
41+
+ ["Notable Passive Skills in Radius are Transformed to instead grant: (%d+)%% increased Mana Cost of Skills and (%d+)%% increased Spell Damage"] = function(num1, num2)
42+
+ return function(node, out, data)
43+
+ if node and node.type == "Notable" then
44+
+ out:NewMod("PassiveSkillHasOtherEffect", "FLAG", true, data.modSource)
45+
+ out:NewMod("NodeModifier", "LIST", { mod = mod("ManaCost", "INC", tonumber(num1), data.modSource) }, data.modSource)
46+
+ out:NewMod("NodeModifier", "LIST", { mod = mod("Damage", "INC", tonumber(num2), data.modSource, ModFlag.Spell) }, data.modSource)
47+
+ end
48+
end
49+
end,
50+
- ["Notable Passive Skills in Radius are Transformed to instead grant: Minions take 20% increased Damage"] = function(node, out, data)
51+
- if node and node.type == "Notable" then
52+
- out:NewMod("PassiveSkillHasOtherEffect", "FLAG", true, data.modSource)
53+
- out:NewMod("NodeModifier", "LIST", { mod = mod("MinionModifier", "LIST", { mod = mod("DamageTaken", "INC", 20, data.modSource) }) }, data.modSource)
54+
+ ["Notable Passive Skills in Radius are Transformed to instead grant: Minions take (%d+)%% increased Damage"] = function(num)
55+
+ return function(node, out, data)
56+
+ if node and node.type == "Notable" then
57+
+ out:NewMod("PassiveSkillHasOtherEffect", "FLAG", true, data.modSource)
58+
+ out:NewMod("NodeModifier", "LIST", { mod = mod("MinionModifier", "LIST", { mod = mod("DamageTaken", "INC", tonumber(num), data.modSource) }) }, data.modSource)
59+
+ end
60+
end
61+
end,
62+
- ["Notable Passive Skills in Radius are Transformed to instead grant: Minions have 25% reduced Movement Speed"] = function(node, out, data)
63+
- if node and node.type == "Notable" then
64+
- out:NewMod("PassiveSkillHasOtherEffect", "FLAG", true, data.modSource)
65+
- out:NewMod("NodeModifier", "LIST", { mod = mod("MinionModifier", "LIST", { mod = mod("MovementSpeed", "INC", -25, data.modSource) }) }, data.modSource)
66+
+ ["Notable Passive Skills in Radius are Transformed to instead grant: Minions have (%d+)%% reduced Movement Speed"] = function(num)
67+
+ return function(node, out, data)
68+
+ if node and node.type == "Notable" then
69+
+ out:NewMod("PassiveSkillHasOtherEffect", "FLAG", true, data.modSource)
70+
+ out:NewMod("NodeModifier", "LIST", { mod = mod("MinionModifier", "LIST", { mod = mod("MovementSpeed", "INC", -num, data.modSource) }) }, data.modSource)
71+
+ end
72+
end
73+
end,
74+
}

0 commit comments

Comments
 (0)