Skip to content

Added ascendancy nodes: No Mercy + Corrupted Lifeforce #1669

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

Open
MrHB212 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Added ascendancy nodes: No Mercy + Corrupted Lifeforce #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5360b7
Witchhunter - No Mercy
MrHB212 Dec 20, 2025
b0f7740
Ritualist - Corrupted Lifeforce
MrHB212 Dec 20, 2025
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
5 changes: 2 additions & 3 deletions src/Data/ModCache.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,8 +1569,7 @@ c["15% increased maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="
c["15% increased maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="INC",value=15}},nil}
c["15% less maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="MORE",value=-15}},nil}
c["15% less maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="MORE",value=-15}},nil}
c["15% more Damage against Enemies affected by Blood Boils"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="MORE",value=15}}," against Enemies affected by Blood Boils "}
c["15% more Damage against Enemies affected by Blood Boils Grants Skill: Blood Boil"]={{[1]={[1]={includeTransfigured=true,skillName="Blood Boil",type="SkillName"},flags=0,keywordFlags=0,name="Damage",type="MORE",value=15}}," against Enemies affected by Blood Boils Grants Skill:"}
c["15% more Damage against Enemies affected by Blood Boils"]={{[1]={[1]={type="Condition",var="EnemyAffectedByBloodBoils"},flags=0,keywordFlags=0,name="Damage",type="MORE",value=15},[2]={flags=0,keywordFlags=0,name="EnemyBloodBoils",type="FLAG",value=true}},nil}
c["15% more Maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="MORE",value=15}},nil}
c["15% of Damage from Hits is taken from your Damageable Companion's Life before you"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="BASE",value=15}}," from Hits is taken from your Damageable Companion's Life before you "}
c["15% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=15}},nil}
Expand Down Expand Up @@ -4697,7 +4696,7 @@ c["Deal 30% of Overkill damage to enemies within 2 metres of the enemy killed"]=
c["Deal 4% increased Damage with Hits to Rare or Unique Enemies for each second they've ever been in your Presence, up to a maximum of 200%"]={{[1]={[1]={actor="enemy",limit=200,limitTotal=true,type="Multiplier",var="EnemyPresenceSeconds"},[2]={actor="enemy",type="ActorCondition",var="RareOrUnique"},flags=0,keywordFlags=262144,name="Damage",type="INC",value=4}},nil}
c["Deal no Elemental Damage"]={{[1]={flags=0,keywordFlags=0,name="DealNoLightning",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="DealNoCold",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="DealNoFire",type="FLAG",value=true}},nil}
c["Deal no Non-Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="DealNoPhysical",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="DealNoLightning",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="DealNoCold",type="FLAG",value=true},[4]={flags=0,keywordFlags=0,name="DealNoChaos",type="FLAG",value=true}},nil}
c["Deal up to 40% more Damage to Enemies based on their missing Concentration"]={nil,"up to 40% more Damage to Enemies based on their missing Concentration "}
c["Deal up to 40% more Damage to Enemies based on their missing Concentration"]={{[1]={[1]={type="Condition",var="EnemyNoConcentration"},flags=0,keywordFlags=0,name="Damage",type="MORE",value=40},[2]={flags=0,keywordFlags=0,name="EnemyConcentration",type="FLAG",value=true}},nil}
c["Deal your Thorns Damage to Enemies you Stun with Melee Attacks"]={nil,"your Thorns Damage to Enemies you Stun with Melee Attacks "}
c["Deal your Thorns Damage to Enemies you Stun with Melee Attacks 35 to 53 Physical Thorns damage"]={nil,"your Thorns Damage to Enemies you Stun with Melee Attacks 35 to 53 Physical Thorns damage "}
c["Deals 25% of current Mana as Chaos Damage to you when Effect ends"]={nil,"Deals 25% of current Mana as Chaos Damage to you when Effect ends "}
Expand Down
6 changes: 6 additions & 0 deletions src/Modules/ConfigOptions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1822,6 +1822,12 @@ Huge sets the radius to 11.
{ var = "conditionEnemyCoveredInFrost", type = "check", label = "Is the enemy covered in Frost?", tooltip = "Covered in Frost applies the following to the enemy:\n\t20% increased ^x3F6DB3Cold ^7Damage taken\n\t50% less Critical Strike Chance", apply = function(val, modList, enemyModList)
modList:NewMod("CoveredInFrostEffect", "BASE", 20, "Covered in Frost")
end },
{ var = "conditionEnemyConcentration", type = "check", label = "Is the enemy Concentration 0?", ifFlag ="EnemyConcentration", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:EnemyNoConcentration", "FLAG", true, "Config", { type = "Condition", var = "Effective" } )
end },
{ var = "conditionEnemyBloodBoils", type = "check", label = "Is the enemy affected by Blood Boils?", ifFlag ="EnemyBloodBoils", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:EnemyAffectedByBloodBoils", "FLAG", true, "Config", { type = "Condition", var = "Effective" } )
end },
{ var = "conditionEnemyHasOpenWeakness", type = "check", label = "Does enemy have Open Weakness?", ifCond = "EnemyHasOpenWeakness", apply = function(val, modList, enemyModList)
-- This one means the enemy you're targeting has open weakness
modList:NewMod("Condition:EnemyHasOpenWeakness", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
Expand Down
10 changes: 10 additions & 0 deletions src/Modules/ModParser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3247,6 +3247,11 @@ local specialModList = {
mod("PhysicalMax", "BASE", 1, { type = "PercentStat", stat = "LifeCost", percent = num }, { type = "StatThreshold", stat = "LifeUnreserved", thresholdStat = "LifeCost", thresholdPercent = num }),
} end,
["gain maximum life instead of maximum energy shield from equipped armour items"] = { flag("ConvertArmourESToLife") },
-- Mercenary - Witchhunter
["deal up to (%d+)%% more damage to enemies based on their missing concentration"] = function(num) return {
mod("Damage", "MORE", num, {type = "Condition", var ="EnemyNoConcentration"}),
flag("EnemyConcentration"),
} end,
-- Mercenary - Gemling
["attribute requirements of gems can be satisi?fied by your highest attribute"] = { flag("GemAttributeRequirementsSatisfiedByHighestAttribute") },
["you can use two copies of the same support gem in different skills"] = { mod("MaxSupportGemCopies", "OVERRIDE", 2) },
Expand All @@ -3268,6 +3273,11 @@ local specialModList = {
mod("ManaCost", "MORE", -count, { type = "Condition", var = "MostNumerousBlueSocketedSupports" })
} end,

-- Huntress - Ritualist
["(%d+)%% more damage against enemies affected by blood boils"] = function(num) return {
mod("Damage", "MORE", num, {type = "Condition", var = "EnemyAffectedByBloodBoils"}),
flag("EnemyBloodBoils"),
} end,
-- Monk - Stormweaver
["targets can be affected by two of your shocks at the same time"] = { flag("ShockCanStack"), mod("ShockStacksMax", "OVERRIDE", 2) },
["targets can be affected by two of your chills at the same time"] = { flag("ChillCanStack"), mod("ChillStacksMax", "OVERRIDE", 2) },
Expand Down
Loading