@@ -2495,7 +2495,7 @@ function calcs.offence(env, actor, activeSkill)
24952495 -- Iterative over all the active skills to account for exerted attacks provided by warcries
24962496 if not activeSkill .skillTypes [SkillType .NeverExertable ] and not activeSkill .skillTypes [SkillType .Triggered ] and not activeSkill .skillTypes [SkillType .Channel ] and not activeSkill .skillTypes [SkillType .OtherThingUsesSkill ] and not activeSkill .skillTypes [SkillType .Retaliation ] then
24972497 for index , value in ipairs (actor .activeSkillList ) do
2498- if value .activeEffect .grantedEffect .name == " Ancestral Cry" and activeSkill .skillTypes [SkillType .MeleeSingleTarget ] and not globalOutput .AncestralCryCalculated then
2498+ if value .activeEffect .grantedEffect .name == " Ancestral Cry" and activeSkill .skillTypes [SkillType .MeleeSingleTarget ] and not globalOutput .AncestralCryCalculated and not value . skillFlags . disable then
24992499 globalOutput .AncestralCryDuration = calcSkillDuration (value .skillModList , value .skillCfg , value .skillData , env , enemyDB )
25002500 globalOutput .AncestralCryCooldown = calcSkillCooldown (value .skillModList , value .skillCfg , value .skillData )
25012501 globalOutput .AncestralCryCastTime = calcWarcryCastTime (value .skillModList , value .skillCfg , value .skillData , actor )
@@ -2518,7 +2518,7 @@ function calcs.offence(env, actor, activeSkill)
25182518 t_insert (globalBreakdown .AncestralUpTimeRatio , s_format (" = %d%%" , globalOutput .AncestralUpTimeRatio ))
25192519 end
25202520 globalOutput .AncestralCryCalculated = true
2521- elseif value .activeEffect .grantedEffect .name == " Infernal Cry" and not globalOutput .InfernalCryCalculated then
2521+ elseif value .activeEffect .grantedEffect .name == " Infernal Cry" and not globalOutput .InfernalCryCalculated and not value . skillFlags . disable then
25222522 globalOutput .InfernalCryDuration = calcSkillDuration (value .skillModList , value .skillCfg , value .skillData , env , enemyDB )
25232523 globalOutput .InfernalCryCooldown = calcSkillCooldown (value .skillModList , value .skillCfg , value .skillData )
25242524 globalOutput .InfernalCryCastTime = calcWarcryCastTime (value .skillModList , value .skillCfg , value .skillData , actor )
@@ -2543,7 +2543,7 @@ function calcs.offence(env, actor, activeSkill)
25432543 end
25442544 end
25452545 globalOutput .InfernalCryCalculated = true
2546- elseif value .activeEffect .grantedEffect .name == " Intimidating Cry" and activeSkill .skillTypes [SkillType .Melee ] and not globalOutput .IntimidatingCryCalculated then
2546+ elseif value .activeEffect .grantedEffect .name == " Intimidating Cry" and activeSkill .skillTypes [SkillType .Melee ] and not globalOutput .IntimidatingCryCalculated and not value . skillFlags . disable then
25472547 globalOutput .CreateWarcryOffensiveCalcSection = true
25482548 globalOutput .IntimidatingCryDuration = calcSkillDuration (value .skillModList , value .skillCfg , value .skillData , env , enemyDB )
25492549 globalOutput .IntimidatingCryCooldown = calcSkillCooldown (value .skillModList , value .skillCfg , value .skillData )
@@ -2589,7 +2589,7 @@ function calcs.offence(env, actor, activeSkill)
25892589 globalOutput .TheoreticalOffensiveWarcryEffect = globalOutput .TheoreticalOffensiveWarcryEffect * globalOutput .IntimidatingHitEffect
25902590 globalOutput .TheoreticalMaxOffensiveWarcryEffect = globalOutput .TheoreticalMaxOffensiveWarcryEffect * globalOutput .IntimidatingMaxHitEffect
25912591 globalOutput .IntimidatingCryCalculated = true
2592- elseif value .activeEffect .grantedEffect .name == " Rallying Cry" and activeSkill .skillTypes [SkillType .Melee ] and not globalOutput .RallyingCryCalculated then
2592+ elseif value .activeEffect .grantedEffect .name == " Rallying Cry" and activeSkill .skillTypes [SkillType .Melee ] and not globalOutput .RallyingCryCalculated and not value . skillFlags . disable then
25932593 globalOutput .CreateWarcryOffensiveCalcSection = true
25942594 globalOutput .RallyingCryDuration = calcSkillDuration (value .skillModList , value .skillCfg , value .skillData , env , enemyDB )
25952595 globalOutput .RallyingCryCooldown = calcSkillCooldown (value .skillModList , value .skillCfg , value .skillData )
@@ -2636,7 +2636,7 @@ function calcs.offence(env, actor, activeSkill)
26362636 globalOutput .TheoreticalMaxOffensiveWarcryEffect = globalOutput .TheoreticalMaxOffensiveWarcryEffect * globalOutput .RallyingMaxHitEffect
26372637 globalOutput .RallyingCryCalculated = true
26382638
2639- elseif value .activeEffect .grantedEffect .name == " Seismic Cry" and activeSkill .skillTypes [SkillType .Slam ] and not globalOutput .SeismicCryCalculated then
2639+ elseif value .activeEffect .grantedEffect .name == " Seismic Cry" and activeSkill .skillTypes [SkillType .Slam ] and not globalOutput .SeismicCryCalculated and not value . skillFlags . disable then
26402640 globalOutput .CreateWarcryOffensiveCalcSection = true
26412641 globalOutput .SeismicCryDuration = calcSkillDuration (value .skillModList , value .skillCfg , value .skillData , env , enemyDB )
26422642 globalOutput .SeismicCryCooldown = calcSkillCooldown (value .skillModList , value .skillCfg , value .skillData )
@@ -2667,7 +2667,7 @@ function calcs.offence(env, actor, activeSkill)
26672667 t_insert (globalBreakdown .SeismicUpTimeRatio , s_format (" = %d%%" , globalOutput .SeismicUpTimeRatio ))
26682668 end
26692669 globalOutput .SeismicCryCalculated = true
2670- elseif value .activeEffect .grantedEffect .name == " Battlemage's Cry" and not globalOutput .BattleMageCryCalculated then
2670+ elseif value .activeEffect .grantedEffect .name == " Battlemage's Cry" and not globalOutput .BattleMageCryCalculated and not value . skillFlags . disable then
26712671 globalOutput .BattleMageCryDuration = calcSkillDuration (value .skillModList , value .skillCfg , value .skillData , env , enemyDB )
26722672 globalOutput .BattleMageCryCooldown = calcSkillCooldown (value .skillModList , value .skillCfg , value .skillData )
26732673 globalOutput .BattleMageCryCastTime = calcWarcryCastTime (value .skillModList , value .skillCfg , value .skillData , actor )
0 commit comments