From b8c0a852b3dc4fc75e4dbc6593a4f3054aa7f2f3 Mon Sep 17 00:00:00 2001
From: Peechey <92683202+Peechey@users.noreply.github.com>
Date: Fri, 12 Jun 2026 19:41:57 -0500
Subject: [PATCH 1/2] fix many supports not adding cooldown to ActiveSkill

---
 src/Data/SkillStatMap.lua       | 6 +++---
 src/Modules/CalcActiveSkill.lua | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Data/SkillStatMap.lua b/src/Data/SkillStatMap.lua
index 7a31555daa..b8dd8a3ce5 100644
--- a/src/Data/SkillStatMap.lua
+++ b/src/Data/SkillStatMap.lua
@@ -576,8 +576,7 @@ return {
 	div = 1000,
 },
 ["support_hourglass_display_cooldown_time_ms"] = {
-	mod("CooldownRecovery", "BASE", nil),
-	div = 1000,
+	-- handled around 700 of CalcActiveSkill, search for level.cooldown
 },
 ["base_cooldown_modifiable_repeat_interval_ms"] = {
 	mod("CooldownRecovery", "BASE", nil),
@@ -2905,7 +2904,8 @@ return {
 	flag("Condition:CanGainRage", { type = "GlobalEffect", effectType = "Buff", effectName = "Rage" } ),
 },
 ["warcry_count_power_from_enemies"] = {
-	flag("UsesWarcryPower", { type = "GlobalEffect", effectType = "Warcry" })
+	flag("UsesWarcryPower", { type = "GlobalEffect", effectType = "Warcry" }),
+	flag("Condition:Empowered", { type = "GlobalEffect", effectType = "Warcry" }),
 },
 ["chance_to_gain_1_more_charge_%"] = {
 	mod("AdditionalChargeChance", "BASE", nil)
diff --git a/src/Modules/CalcActiveSkill.lua b/src/Modules/CalcActiveSkill.lua
index 9b2a92aa5c..0f39c40ee6 100644
--- a/src/Modules/CalcActiveSkill.lua
+++ b/src/Modules/CalcActiveSkill.lua
@@ -698,6 +698,9 @@ function calcs.buildActiveSkillModList(env, activeSkill)
 			if level.spiritReservationFlat then
 				skillModList:NewMod("ExtraSpirit", "BASE", level.spiritReservationFlat, skillEffect.grantedEffect.modSource)
 			end
+			if level.cooldown then
+				skillModList:NewMod("CooldownRecovery", "BASE", level.cooldown, skillEffect.grantedEffect.modSource)
+			end
 			-- Handle multiple triggers situation and if triggered by a trigger skill save a reference to the trigger.
 			local match = skillEffect.grantedEffect.addSkillTypes and (not skillFlags.disable)
 			if match and skillEffect.grantedEffect.isTrigger then

From 5d7d2ebbee2d0a1c63b047a45f5cd39ba19cd290 Mon Sep 17 00:00:00 2001
From: Peechey <92683202+Peechey@users.noreply.github.com>
Date: Fri, 12 Jun 2026 19:50:54 -0500
Subject: [PATCH 2/2] clean up

---
 src/Data/SkillStatMap.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Data/SkillStatMap.lua b/src/Data/SkillStatMap.lua
index b8dd8a3ce5..edbc8862ee 100644
--- a/src/Data/SkillStatMap.lua
+++ b/src/Data/SkillStatMap.lua
@@ -2904,8 +2904,7 @@ return {
 	flag("Condition:CanGainRage", { type = "GlobalEffect", effectType = "Buff", effectName = "Rage" } ),
 },
 ["warcry_count_power_from_enemies"] = {
-	flag("UsesWarcryPower", { type = "GlobalEffect", effectType = "Warcry" }),
-	flag("Condition:Empowered", { type = "GlobalEffect", effectType = "Warcry" }),
+	flag("UsesWarcryPower", { type = "GlobalEffect", effectType = "Warcry" })
 },
 ["chance_to_gain_1_more_charge_%"] = {
 	mod("AdditionalChargeChance", "BASE", nil)