Add support for Loyalty/damage taken from Companion's Life before you (#2159)

* Add support for damage taken from Companion's Life before you

Implements the "% of Damage from Hits is taken from your (Damageable)
Companion's Life before you" mechanic as a new "companion" ally pool in
the existing alliesTakenBeforeYou framework, covering:

- Tree nodes, Starkonja's Head, and the Bonded rune (hit redirect)
- Forgotten Warden (Deflected Hits variant, scaled by Deflect chance)
- Loyalty and Romira's Requital support gems via a shared statMap entry
  (Romira's recoup is left unsupported for a follow-up)

Total companion life is summed automatically from all active damageable
companion skills: the main-skill minion init in CalcPerform is extracted
into initMinionModDB so non-main companions can be initialised the same
way, with a "Total Companion Life" config field as a manual override.

Also drops the stale ifSkill="Raise Spectre" gate from the Total Spectre
Life config field so it is reachable in PoE2, and regenerates the four
mis-parsed companion entries in ModCache.

* Fix ModParser + duplicated function

All the companion mods have damageable in the name so no need to exclude it
Added Override to the config to its clearer to users without needing to hover
Made the minion mod loop into a function as its used multiple times

* Fixes

Now auto calcs for spectres too
Changes the mod name so it's capilatised as it now appears in a breakdown list
Fixes the handling of Loyalty as it previously wasn't stacking when using multiple companions

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: ltogniolli

spec/System/TestDefence_spec.lua

@@ -607,4 +607,139 @@ describe("TestDefence", function()
 		assertClose(block.EffectiveBlockChance, 10)
 		assert.is_true(block.TotalEHP > base.TotalEHP)
 	end)
+
+	describe("damage taken from spectres' life before you", function()
+		it("sums spectre life automatically", function()
+			build.skillsTab:PasteSocketGroup("Spectre: Lightless Abomination 20/0  1")
+			build.configTab:BuildModList()
+			build.configTab.modList:NewMod("TakenFromSpectresBeforeYou", "BASE", 15, "Test")
+			build.calcsTab:BuildOutput()
+
+			local output = build.calcsTab.mainOutput
+			assert.are.equals(15, output.SpectreAllyDamageMitigation)
+			local spectreLife = build.calcsTab.mainEnv.player.spectreLifeList[1].life
+			assert.are.equals(spectreLife, output.TotalSpectreLife)
+		end)
+
+		it("uses configured spectre life as an override", function()
+			build.skillsTab:PasteSocketGroup("Spectre: Lightless Abomination 20/0  1")
+			build.configTab.input.TotalSpectreLife = 1000
+			build.configTab:BuildModList()
+			build.configTab.modList:NewMod("TakenFromSpectresBeforeYou", "BASE", 15, "Test")
+			build.calcsTab:BuildOutput()
+
+			assert.are.equals(1000, build.calcsTab.mainOutput.TotalSpectreLife)
+		end)
+	end)
+
+	describe("damage taken from companion's life before you", function()
+		it("redirects damage to the configured companion life pool", function()
+			build.configTab.input.enemyIsBoss = "None"
+			build.configTab.input.customMods = ""
+			pob1and2Compat()
+			local baseMaxHit = build.calcsTab.calcsOutput.PhysicalMaximumHitTaken
+
+			build.configTab.input.customMods = "15% of Damage from Hits is taken from your Damageable Companion's Life before you"
+			build.configTab.input.TotalCompanionLife = 1000
+			pob1and2Compat()
+
+			local output = build.calcsTab.calcsOutput
+			assert.are.equals(15, output.CompanionAllyDamageMitigation)
+			assert.are.equals(1000, output.TotalCompanionLife)
+			assert.is_true(output.PhysicalMaximumHitTaken > baseMaxHit)
+
+			local totalTaken = takenHitFromTypeMaxHit("Physical")
+			local pools = poolsRemainingAfterTypeMaxHit("Physical")
+			local drained = 1000 - pools.AlliesTakenBeforeYou["companion"].remaining
+			assert.are.near(totalTaken * 0.15, drained, 1)
+		end)
+
+		it("stacks redirect sources additively", function()
+			build.configTab.input.enemyIsBoss = "None"
+			build.configTab.input.customMods = "\z
+			5% of Damage from Hits is taken from your Damageable Companion's Life before you\n\z
+			15% of Damage from Hits is taken from your Damageable Companion's Life before you\n\z
+			"
+			build.configTab.input.TotalCompanionLife = 100
+			pob1and2Compat()
+
+			assert.are.equals(20, build.calcsTab.calcsOutput.CompanionAllyDamageMitigation)
+		end)
+
+		it("scales the deflected-hits redirect by deflect chance", function()
+			build.configTab.input.enemyIsBoss = "None"
+			build.configTab.input.customMods = "\z
+			10% of Damage from Deflected Hits is taken from Damageable Companion's Life before you\n\z
+			+1000 to Deflection Rating\n\z
+			"
+			build.configTab.input.TotalCompanionLife = 500
+			pob1and2Compat()
+
+			local output = build.calcsTab.calcsOutput
+			assert.is_true(output.DeflectChance > 0)
+			assert.are.near(10 * output.DeflectChance / 100, output.CompanionAllyDamageMitigation, 0.001)
+		end)
+
+		it("sums companion life automatically and applies Loyalty's redirect and life penalty", function()
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Abomination 20/0  1")
+			runCallback("OnFrame")
+			local unsupportedLife = build.calcsTab.calcsEnv.minion.output.Life
+
+			newBuild()
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Abomination 20/0  1\nLoyalty 1/0  1")
+			runCallback("OnFrame")
+
+			local output = build.calcsTab.calcsOutput
+			local companionLife = build.calcsTab.calcsEnv.minion.output.Life
+			assert.are.equals(10, output.CompanionAllyDamageMitigation)
+			assert.are.equals(companionLife, output.TotalCompanionLife)
+			assert.are.near(unsupportedLife * 0.7, companionLife, 1)
+		end)
+
+		it("sums companion life when the companion is not the main skill", function()
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Abomination 20/0  1\nLoyalty 1/0  1")
+			runCallback("OnFrame")
+			local mainSkillCompanionLife = build.calcsTab.calcsOutput.TotalCompanionLife
+
+			newBuild()
+			build.skillsTab:PasteSocketGroup("Quarterstaff Strike 20/0  1")
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Abomination 20/0  1\nLoyalty 1/0  1")
+			build.mainSocketGroup = 1
+			runCallback("OnFrame")
+
+			local output = build.calcsTab.calcsOutput
+			assert.are.equals(10, output.CompanionAllyDamageMitigation)
+			assert.are.near(mainSkillCompanionLife, output.TotalCompanionLife, 1)
+		end)
+
+		it("stacks Loyalty's redirect from multiple companion skills", function()
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Abomination 20/0  1\nLoyalty 1/0  1")
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Moray 20/0  1\nLoyalty 1/0  1")
+			runCallback("OnFrame")
+
+			assert.are.equals(20, build.calcsTab.calcsOutput.CompanionAllyDamageMitigation)
+		end)
+
+		it("does not count global companion redirect once per companion skill", function()
+			build.configTab.input.customMods = "5% of Damage from Hits is taken from your Damageable Companion's Life before you"
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Abomination 20/0  1")
+			build.skillsTab:PasteSocketGroup("Companion: Lightless Abomination 20/0  1")
+			pob1and2Compat()
+
+			assert.are.equals(5, build.calcsTab.calcsOutput.CompanionAllyDamageMitigation)
+		end)
+
+		it("has no effect with no companions and no config override", function()
+			build.configTab.input.enemyIsBoss = "None"
+			build.configTab.input.customMods = ""
+			pob1and2Compat()
+			local baseMaxHit = build.calcsTab.calcsOutput.PhysicalMaximumHitTaken
+
+			build.configTab.input.customMods = "15% of Damage from Hits is taken from your Damageable Companion's Life before you"
+			pob1and2Compat()
+
+			assert.are.equals(0, build.calcsTab.calcsOutput.TotalCompanionLife)
+			assert.are.equals(baseMaxHit, build.calcsTab.calcsOutput.PhysicalMaximumHitTaken)
+		end)
+	end)
 end)

src/Data/ModCache.lua

@@ -1541,6 +1541,7 @@ c["13% increased Skill Speed"]={{[1]={flags=0,keywordFlags=0,name="Speed",type="
 c["13% increased Spell damage for each 200 total Mana you have Spent Recently"]={{[1]={[1]={div=200,type="Multiplier",var="ManaSpentRecently"},flags=2,keywordFlags=0,name="Damage",type="INC",value=13}},nil}
 c["13% increased maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="INC",value=13}},nil}
 c["13% increased maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="INC",value=13}},nil}
+c["13% of Damage from Deflected Hits is taken from Damageable Companion's Life before you"]={{[1]={flags=0,keywordFlags=0,name="TakenFromCompanionBeforeYouFromDeflected",type="BASE",value=13}},nil}
 c["13% reduced Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=-13}},nil}
 c["13% reduced Attack and Cast Speed"]={{[1]={flags=0,keywordFlags=0,name="Speed",type="INC",value=-13}},nil}
 c["13% reduced Charges per use"]={{[1]={flags=0,keywordFlags=0,name="FlaskChargesUsed",type="INC",value=-13}},nil}
@@ -1739,8 +1740,8 @@ c["15% less maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="MORE"
 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 Maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="MORE",value=15}},nil}
-c["15% of Damage from Deflected Hits is taken from Damageable Companion's Life before you"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="BASE",value=15}},"  from Deflected Hits is taken from Damageable Companion's Life before you "}
-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 from Deflected Hits is taken from Damageable Companion's Life before you"]={{[1]={flags=0,keywordFlags=0,name="TakenFromCompanionBeforeYouFromDeflected",type="BASE",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="TakenFromCompanionBeforeYou",type="BASE",value=15}},nil}
 c["15% of Damage is taken from Mana before Life"]={{[1]={flags=0,keywordFlags=0,name="DamageTakenFromManaBeforeLife",type="BASE",value=15}},nil}
 c["15% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=15}},nil}
 c["15% of Damage taken from Deflected Hits Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="DamageTaken",type="BASE",value=15}},"  from Deflected Hits Recouped as Life "}
@@ -2150,7 +2151,7 @@ c["20% more Damage against Heavy Stunned Enemies with Maces"]={{[1]={[1]={actor=
 c["20% more Life Cost of Skills"]={{[1]={flags=0,keywordFlags=0,name="LifeCost",type="MORE",value=20}},nil}
 c["20% more Stun Buildup with Critical Hits"]={{[1]={[1]={type="Condition",var="CriticalStrike"},flags=0,keywordFlags=0,name="EnemyHeavyStunBuildup",type="MORE",value=20}},nil}
 c["20% of Cold Damage taken as Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageTakenAsFire",type="BASE",value=20}},nil}
-c["20% of Damage from Hits is taken from your nearest Totem's Life before you"]={{[1]={[1]={type="Condition",var="HaveTotem"},flags=0,keywordFlags=0,name="takenFromTotemsBeforeYou",type="BASE",value=20}},nil}
+c["20% of Damage from Hits is taken from your nearest Totem's Life before you"]={{[1]={[1]={type="Condition",var="HaveTotem"},flags=0,keywordFlags=0,name="TakenFromTotemsBeforeYou",type="BASE",value=20}},nil}
 c["20% of Damage is taken from Mana before Life"]={{[1]={flags=0,keywordFlags=0,name="DamageTakenFromManaBeforeLife",type="BASE",value=20}},nil}
 c["20% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=20}},nil}
 c["20% of Damage taken Recouped as Mana"]={{[1]={flags=0,keywordFlags=0,name="ManaRecoup",type="BASE",value=20}},nil}
@@ -3082,8 +3083,7 @@ c["5% increased Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="StunThresho
 c["5% increased Stun Threshold per 25 Tribute"]={{[1]={[1]={actor="parent",div=25,stat="Tribute",type="PerStat"},flags=0,keywordFlags=0,name="StunThreshold",type="INC",value=5}},nil}
 c["5% increased effect of Archon Buffs on you"]={{[1]={flags=0,keywordFlags=0,name="LocalEffect",type="INC",value=5}},"  of Archon Buffs on you "}
 c["5% increased total Power counted by Warcries"]={{[1]={flags=0,keywordFlags=0,name="WarcryPower",type="INC",value=5}},nil}
-c["5% of Damage from Hits is taken from your Damageable Companion's Life before you"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="BASE",value=5}},"  from Hits is taken from your Damageable Companion's Life before you "}
-c["5% of Damage from Hits is taken from your Damageable Companion's Life before you 20% increased Armour, Evasion and Energy Shield while your Companion is in your Presence"]={{[1]={[1]={type="Condition",var="CompanionInPresence"},flags=0,keywordFlags=0,name="Damage",type="BASE",value=5}},"  from Hits is taken from your Damageable Companion's Life before you 20% increased Armour, Evasion and Energy Shield  "}
+c["5% of Damage from Hits is taken from your Damageable Companion's Life before you"]={{[1]={flags=0,keywordFlags=0,name="TakenFromCompanionBeforeYou",type="BASE",value=5}},nil}
 c["5% of Damage taken Recouped as Life"]={{[1]={flags=0,keywordFlags=0,name="LifeRecoup",type="BASE",value=5}},nil}
 c["5% of Damage taken bypasses Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="PhysicalEnergyShieldBypass",type="BASE",value=5},[2]={flags=0,keywordFlags=0,name="LightningEnergyShieldBypass",type="BASE",value=5},[3]={flags=0,keywordFlags=0,name="ColdEnergyShieldBypass",type="BASE",value=5},[4]={flags=0,keywordFlags=0,name="FireEnergyShieldBypass",type="BASE",value=5},[5]={flags=0,keywordFlags=0,name="ChaosEnergyShieldBypass",type="BASE",value=5}},nil}
 c["5% of Maximum Life Converted to Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="LifeConvertToEnergyShield",type="BASE",value=5}},nil}

src/Data/SkillStatMap.lua

@@ -2527,6 +2527,9 @@ return {
 ["companions_are_gigantic"] = {
 	mod("MinionModifier", "LIST", { mod = flag("Gigantic") }),
 },
+["companion_takes_%_damage_before_you_from_support"] = {
+	mod("TakenFromCompanionBeforeYou", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }),
+},
 ["minion_damage_+%_final_per_different_elemental_ailment_on_target"] = {
 	mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Electrocuted" }) }),
 	mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Frozen" }) }),

src/Modules/CalcActiveSkill.lua

@@ -1028,6 +1028,15 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 			if tag.type == "GlobalEffect" then
 				effectType = tag.effectType
 				effectName = tag.effectName or activeGrantedEffect.name
+				if activeSkill.minion and activeSkill.minion.minionData then
+					if effectName:find("{0}", 1, true) then
+						effectName = effectName:gsub("{0}", activeSkill.minion.minionData.name)
+					elseif activeGrantedEffect.minionList and effectName:match("^Companion") then
+						effectName = "Companion: "..activeSkill.minion.minionData.name
+					elseif activeGrantedEffect.minionList and effectName:match("^Spectre") then
+						effectName = "Spectre: "..activeSkill.minion.minionData.name
+					end
+				end
 				effectTag = tag
 				break
 			end