add support for Infernal Cry's empowered buff

Author: Peechey

src/Data/SkillStatMap.lua

@@ -586,6 +586,12 @@ return {
 ["warcry_speed_+%"] = {
 	mod("WarcrySpeed", "INC", nil, 0, KeywordFlag.Warcry),
 },
+["warcry_empowers_per_X_monster_power_mp_cap"] = {
+	mod("WarcryPowerCap", "BASE", nil),
+},
+["warcry_empowers_per_X_monster_power"] = {
+	mod("WarcryPowerPer", "BASE", nil),
+},
 ["display_this_skill_cooldown_does_not_recover_during_buff"] = {
 	flag("NoCooldownRecoveryInDuration"),
 },

src/Data/Skills/act_str.lua

@@ -7500,6 +7500,12 @@ skills["InfernalCryPlayer"] = {
 			label = "Infernal Cry",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "infernal_cry",
+			statMap = {
+				["infernal_cry_exerted_attack_all_damage_%_to_gain_as_fire_%"] = {
+					mod("DamageGainAsFire", "BASE", nil, ModFlag.Melee, 0, { type = "GlobalEffect", effectType = "Warcry" }, { type = "Condition", var = "Empowered" }),
+					mod("InfernalCryBaseDamageGainAsFire", "BASE", nil)
+				},
+			},
 			baseFlags = {
 				warcry = true,
 				area = true,

src/Export/Skills/act_str.txt

@@ -481,6 +481,12 @@ statMap = {
 #skill InfernalCryPlayer
 #set InfernalCryPlayer
 #flags warcry area duration
+statMap = {
+	["infernal_cry_exerted_attack_all_damage_%_to_gain_as_fire_%"] = {
+		mod("DamageGainAsFire", "BASE", nil, ModFlag.Melee, 0, { type = "GlobalEffect", effectType = "Warcry" }, { type = "Condition", var = "Empowered" }),
+		mod("InfernalCryBaseDamageGainAsFire", "BASE", nil)
+	},
+},
 #mods
 #skillEnd
 

src/Modules/CalcOffence.lua

@@ -3104,26 +3104,27 @@ function calcs.offence(env, actor, activeSkill)
 						end
 						globalOutput.AncestralCryCalculated = true
 					elseif value.activeEffect.grantedEffect.name == "Infernal Cry" and not globalOutput.InfernalCryCalculated then
+						globalOutput.CreateWarcryOffensiveCalcSection = true
 						globalOutput.InfernalCryDuration = calcSkillDuration(value.skillModList, value.skillCfg, value.skillData, env, enemyDB)
 						globalOutput.InfernalCryCooldown = calcSkillCooldown(value.skillModList, value.skillCfg, value.skillData)
 						globalOutput.InfernalCryCastTime = calcWarcryCastTime(value.skillModList, value.skillCfg, value.skillData, actor)
 						if activeSkill.skillTypes[SkillType.Melee] then
-							globalOutput.InfernalExertsCount = env.modDB:Sum("BASE", nil, "NumInfernalExerts") or 0
-							local baseUptimeRatio = m_min((globalOutput.InfernalExertsCount / globalOutput.Speed) / (globalOutput.InfernalCryCooldown + globalOutput.InfernalCryCastTime), 1) * 100
+							globalOutput.InfernalEmpoweredCount = (modDB:Override(nil, "WarcryPower") or value.skillModList:Sum("BASE", nil, "WarcryPowerCap")) / value.skillModList:Sum("BASE", nil, "WarcryPowerPer")
+							local baseUptimeRatio = m_min((globalOutput.InfernalEmpoweredCount / globalOutput.Speed) / (globalOutput.InfernalCryCooldown + globalOutput.InfernalCryCastTime), 1) * 100
 							local storedUses = value.skillData.storedUses or 0 + value.skillModList:Sum("BASE", value.skillCfg, "AdditionalCooldownUses")
-							globalOutput.InfernalUpTimeRatio = m_min(100, baseUptimeRatio * storedUses)
-							globalOutput.GlobalWarcryUptimeRatio = globalOutput.GlobalWarcryUptimeRatio + globalOutput.InfernalUpTimeRatio
+							globalOutput.InfernalCryUptimeRatio = m_min(100, baseUptimeRatio * storedUses)
+							globalOutput.GlobalWarcryUptimeRatio = globalOutput.GlobalWarcryUptimeRatio + globalOutput.InfernalCryUptimeRatio
 							if globalBreakdown then
-								globalBreakdown.InfernalUpTimeRatio = { }
-								t_insert(globalBreakdown.InfernalUpTimeRatio, s_format("(%d ^8(number of exerts)", globalOutput.InfernalExertsCount))
-								t_insert(globalBreakdown.InfernalUpTimeRatio, s_format("/ %.2f) ^8(attacks per second)", globalOutput.Speed))
+								globalBreakdown.InfernalCryUptimeRatio = { }
+								t_insert(globalBreakdown.InfernalCryUptimeRatio, s_format("(%.2f ^8(number of empowered)", globalOutput.InfernalEmpoweredCount))
+								t_insert(globalBreakdown.InfernalCryUptimeRatio, s_format("/ %.2f) ^8(attacks per second)", globalOutput.Speed))
 								if globalOutput.InfernalCryCastTime > 0 then
-									t_insert(globalBreakdown.InfernalUpTimeRatio, s_format("/ (%.2f ^8(warcry cooldown)", globalOutput.InfernalCryCooldown))
-									t_insert(globalBreakdown.InfernalUpTimeRatio, s_format("+ %.2f) ^8(warcry casttime)", globalOutput.InfernalCryCastTime))
+									t_insert(globalBreakdown.InfernalCryUptimeRatio, s_format("/ (%.2f ^8(warcry cooldown)", globalOutput.InfernalCryCooldown))
+									t_insert(globalBreakdown.InfernalCryUptimeRatio, s_format("+ %.2f) ^8(warcry cast time)", globalOutput.InfernalCryCastTime))
 								else
-									t_insert(globalBreakdown.InfernalUpTimeRatio, s_format("/ %.2f ^8(average warcry cooldown)", globalOutput.InfernalCryCooldown))
+									t_insert(globalBreakdown.InfernalCryUptimeRatio, s_format("/ %.2f ^8(average warcry cooldown)", globalOutput.InfernalCryCooldown))
 								end
-								t_insert(globalBreakdown.InfernalUpTimeRatio, s_format("= %d%%", globalOutput.InfernalUpTimeRatio))
+								t_insert(globalBreakdown.InfernalCryUptimeRatio, s_format("= %d%%", globalOutput.InfernalCryUptimeRatio))
 							end
 						end
 						globalOutput.InfernalCryCalculated = true
@@ -3287,7 +3288,7 @@ function calcs.offence(env, actor, activeSkill)
 				-- Calculate Exerted Attack Uptime
 				-- There are various strategies a player could use to maximize either warcry effect stacking or staggering
 				-- 1) they don't pay attention and therefore we calculated exerted attack uptime as just the maximum uptime of any enabled warcries that exert attacks
-				local warcryList = {"AncestralUpTimeRatio", "InfernalUpTimeRatio", "IntimidatingUpTimeRatio", "RallyingUpTimeRatio", "SeismicUpTimeRatio", "BattlemageUpTimeRatio"}
+				local warcryList = {"AncestralUpTimeRatio", "InfernalCryUptimeRatio", "IntimidatingUpTimeRatio", "RallyingUpTimeRatio", "SeismicUpTimeRatio", "BattlemageUpTimeRatio"}
 				for _, cryTimeRatio in ipairs(warcryList) do
 					globalOutput.ExertedAttackUptimeRatio = m_max(globalOutput.ExertedAttackUptimeRatio or 0, globalOutput[cryTimeRatio] or 0)
 				end
@@ -3373,16 +3374,23 @@ function calcs.offence(env, actor, activeSkill)
 			-- dynamic way of calcing the Ancestral Boost from a single source without duplicating the code
 			-- uptimeOverride: Ancestral Empowerment
 			-- combinedCalcs: ignore INC AoE as we will run that in calcCombinedAncestralBoost
-			local function calcAncestralBoost(skillName, moreDmg, incArea, uptimeOverride, combinedCalcs)
+			-- empowered: for non-ancestrally boosted empowered skills
+			local function calcAncestralBoost(skillName, moreDmg, incArea, uptimeOverride, combinedCalcs, empowered)
 				globalOutput.CreateWarcryOffensiveCalcSection = true -- labels for the CalcSection
 				local skillNameVar = skillName:gsub(" ", "") -- Fist Of War -> FistOfWar
 				local skillNameLabel = skillName:lower()
 
+				if empowered then
+					ancestrallyBoostedIncArea = 0
+					ancestrallyBoostedIncDamageMulti = 0
+				end
+
 				if moreDmg then
 					globalOutput[skillNameVar.."DamageMultiplier"] = moreDmg * (1 + ancestrallyBoostedIncDamageMulti)
 				else
 					globalOutput[skillNameVar.."DamageMultiplier"] = ancestrallyBoostedIncDamageMulti
 				end
+				
 				globalOutput[skillNameVar.."UptimeRatio"] = uptimeOverride or m_min( (1 / globalOutput.Speed) / globalOutput[skillNameVar.."Cooldown"], 1) * 100
 				if globalBreakdown then
 					globalBreakdown[skillNameVar.."UptimeRatio"] = {
@@ -3500,6 +3508,13 @@ function calcs.offence(env, actor, activeSkill)
 			else
 				output.AncestralCallDamageEffect = 1
 			end
+
+			-- Warcries
+			-- Infernal Cry
+			if globalOutput.InfernalCryCooldown ~= 0 then
+				output.InfernalCryDamageEffect = 1
+			end
+
 		end
 
 		-- Calculate maximum sustainable fuses and explosion rate for Explosive Arrow

src/Modules/CalcPerform.lua

@@ -1919,7 +1919,9 @@ function calcs.perform(env, skipEHP)
 						end
 						local full_duration = calcSkillDuration(modStore, skillCfg, activeSkill.skillData, env, enemyDB)
 						local actual_cooldown = calcSkillCooldown(modStore, skillCfg, activeSkill.skillData)
-						local uptime = modDB:Flag(nil, "Condition:WarcryMaxHit") and 1 or m_min(full_duration / actual_cooldown, 1)
+						-- need to scale warcry buffs by their actual uptime
+						local warcryOutputUptime = env.build.calcsTab.mainOutput and (env.build.calcsTab.mainOutput[warcryName.."CryUptimeRatio"] / 100) or nil
+						local uptime = modDB:Flag(nil, "Condition:WarcryMaxHit") and 1 or warcryOutputUptime or m_min(full_duration / actual_cooldown, 1)
 						local extraWarcryModList = activeSkill.activeEffect.grantedEffect.name == "Rallying Cry" and new("ModList") or {}
 						if not modDB:Flag(nil, "CannotGainWarcryBuffs") then
 							if not buff.applyNotPlayer then

src/Modules/CalcSections.lua

@@ -355,15 +355,15 @@ return {
 	{ label = "Skill DPS", flag = "triggered", { format = "{1:output:TotalDPS}", { breakdown = "TotalDPS" }, { label = "DPS Multiplier", modName = "DPS", cfg = "skill" }, }, },
 } }
 } },
-{ 3, "Warcries", 1, colorCodes.OFFENCE, {{ defaultCollapsed = false, label = "Ancestral Boosts", data = {
+{ 3, "Warcries", 1, colorCodes.OFFENCE, {{ defaultCollapsed = false, label = "Empowered Stats", data = {
 	extra = "{2:output:TheoreticalOffensiveWarcryEffect} Avg Combined Impact  |  {2:output:TheoreticalMaxOffensiveWarcryEffect} Max Combined Impact",
 	colWidth = 114,
 	{
 		haveOutput = "CreateWarcryOffensiveCalcSection",
 		{ format = "Effective Impact" },
 		{ format = "Avg Dmg Effect" },
 		{ format = "Uptime" },
-		{ format = "Number of Exerts" },
+		{ format = "# of Empowered" },
 		{ format = "Max 1-Hit Impact"},
 	},
 	{ label = "Seismic Cry", haveOutput = "SeismicUpTimeRatio", 
@@ -387,11 +387,11 @@ return {
 		{ format = "{0:output:RallyingExertsCount}" },
 		{ format = "{2:output:RallyingMaxHitEffect}" },
 	},
-	{ label = "Infernal Cry", haveOutput = "InfernalUpTimeRatio", 
+	{ label = "Infernal Cry", haveOutput = "InfernalCryUptimeRatio",
 		{ format = "" },
 		{ format = "" },
-		{ format = "{0:output:InfernalUpTimeRatio}%", { breakdown = "InfernalUpTimeRatio" }, },
-		{ format = "{0:output:InfernalExertsCount}" },
+		{ format = "{0:output:InfernalCryUptimeRatio}%", { breakdown = "InfernalCryUptimeRatio" }, },
+		{ format = "{0:output:InfernalEmpoweredCount}" },
 		{ format = "" },
 	},
 	{ label = "Battlemage's Cry", haveOutput = "BattlemageUpTimeRatio", 
@@ -408,13 +408,13 @@ return {
 		{ format = "{0:output:AncestralExertsCount}" },
 		{ format = "" },
 	},
-	{ label = "Exerted Attacks", bgCol = colorCodes.MAINHANDBG, haveOutput = "ExertedAttackUptimeRatio",
-		{ format = "{2:output:ExertedAttackHitEffect}", { breakdown = "ExertedAttackHitEffect"}, },
-		{ format = "{2:output:ExertedAttackAvgDmg}", { modName = "ExertIncrease", cfg = "skill" }, { modName = "ExertAttackIncrease", cfg = "skill" }, },
-		{ format = "{0:output:ExertedAttackUptimeRatio}%", { breakdown = "ExertedAttackUptimeRatio" }, },
-		{ format = "" },
-		{ format = "{2:output:ExertedAttackMaxHitEffect}", { modName = "ExertIncrease", cfg = "skill" }, { modName = "ExertAttackIncrease", cfg = "skill" }, },
-	},
+	--{ label = "Exerted Attacks", bgCol = colorCodes.MAINHANDBG, haveOutput = "ExertedAttackUptimeRatio",
+	--	{ format = "{2:output:ExertedAttackHitEffect}", { breakdown = "ExertedAttackHitEffect"}, },
+	--	{ format = "{2:output:ExertedAttackAvgDmg}", { modName = "ExertIncrease", cfg = "skill" }, { modName = "ExertAttackIncrease", cfg = "skill" }, },
+	--	{ format = "{0:output:ExertedAttackUptimeRatio}%", { breakdown = "ExertedAttackUptimeRatio" }, },
+	--	{ format = "" },
+	--	{ format = "{2:output:ExertedAttackMaxHitEffect}", { modName = "ExertIncrease", cfg = "skill" }, { modName = "ExertAttackIncrease", cfg = "skill" }, },
+	--},
 	{ label = "AncestralEmpower+", bgCol = colorCodes.MAINHANDBG, haveOutput = "AncestralEmpowermentCombinedUptimeRatio",
 	  { format = "{2:output:AvgAncestralEmpowermentCombinedDamageEffect}", { breakdown = "AvgAncestralEmpowermentCombinedDamageEffect"}, },
 	  { format = "{2:output:AvgAncestralEmpowermentCombinedDamage}", { modName = { "AncestralEmpowermentDamageMultiplier", "FistOfWarDamageMultiplier" }, cfg = "skill" }, { modName = "AncestralBoostDamage", cfg = "skill" }, },

src/Modules/CalcTriggers.lua

@@ -489,7 +489,7 @@ local function defaultTriggerHandler(env, config)
 
 			-- Infernal Cry uptime
 			if actor.mainSkill.activeEffect.grantedEffect.name == "Combust" and GlobalCache.cachedData[env.mode][uuid] and source and source.skillTypes[SkillType.Melee] then
-				local infernalCryExertsCount = GlobalCache.cachedData[env.mode][uuid].Env.player.output.InfernalExertsCount
+				local infernalCryExertsCount = GlobalCache.cachedData[env.mode][uuid].Env.player.output.InfernalEmpoweredCount
 				local infernalCryDuration = ceil_b(GlobalCache.cachedData[env.mode][uuid].Env.player.output.InfernalCryDuration, data.misc.ServerTickTime)
 				local infernalCryCastTime = GlobalCache.cachedData[env.mode][uuid].Env.player.output.InfernalCryCastTime
 				local infernalCryCooldown = ceil_b(GlobalCache.cachedData[env.mode][uuid].Env.player.output.InfernalCryCooldown, data.misc.ServerTickTime)