Rework capstone warcries talent

@@ -3454,20 +3454,37 @@ newTalent{
 }
 
 newTalent{
-	name = "Second Wind",
+	name = "Battle Cry",
 	type = {"technique/other", 1},
 	points = 5,
-	cooldown = 50,
-	no_energy = true,
-	tactical = { STAMINA = 2 },
-	getStamina = function(self, t) return 10 + self:combatTalentLimit(t, 2, .5, 1.3)*(self:getStr() + self:getWil()) end,
+	cooldown = 30,
+	stamina = 20,
+	range = 0,
+	radius = function(self, t) return math.min(12, math.floor(self:combatTalentScale(t, 4, 8))) end,
+	target = function(self, t)
+		return {type="cone", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false}
+	end,
+	getSavesRed = function(self, t) return math.floor(self:combatTalentScale(t, 10, 30)) end,
+	getBleedRed = function(self, t) return math.min(100, math.floor(self:combatTalentScale(t, 33, 59))) end,
+	requires_target = true,
+	tactical = { DISABLE = 2 },
 	action = function(self, t)
-		self:incStamina(t.getStamina(self, t))
+		local tg = self:getTalentTarget(t)
+		local x, y = self:getTarget(tg)
+		if not x or not y then return nil end
+		self:project(tg, x, y, function(px, py)
+			local target = game.level.map(px, py, Map.ACTOR)
+			if not target then return end
+			target:setEffect(target.EFF_BATTLE_CRY, 7, {power=t.getSavesRed(self, t), bleed=t.getBleedRed(self, t), apply_power=self:combatPhysicalpower()})
+		end)
+		game.level.map:particleEmitter(self.x, self.y, self:getTalentRadius(t), "directional_shout", {life=12, size=5, tx=x-self.x, ty=y-self.y, distorion_factor=0.1, radius=self:getTalentRadius(t), nb_circles=8, rm=0.8, rM=1, gm=0.8, gM=1, bm=0.1, bM=0.2, am=0.6, aM=0.8})
 		return true
 	end,
 	info = function(self, t)
-		return ([[Take a deep breath to recover %d stamina.  The stamina recovery improves with your Strength and Willpower.]]):
-		format(t.getStamina(self, t))
+		return ([[Your battle cry shatters the will of your foes within a radius of %d, lowering their defense and all saves by %d and their bleed resist by %d%% for 7 turns, making them more vulnerable.
+		All evasion and concealment bonuses are also disabled.
+		The chance to hit increases with your Physical Power.]]):
+		tformat(self:getTalentRadius(t), t.getSavesRed(self,t), t.getBleedRed(self,t))
 	end,
 }
 

@@ -113,7 +113,7 @@ newTalent{
 		end
 	},
 	getHealPercent = function(self,t) return self:combatTalentLimit(t, 50, 3.5, 17.5) end, -- Limit <50%
-	getDuration = function(self, t) return math.floor(self:combatTalentLimit(t, 10, 3, 6, true)) end, -- Limit < 10
+	getDuration = function(self, t) return math.floor(self:combatTalentLimit(t, 11, 3, 7, true)) end, -- Limit <= 10
 	action = function(self, t)
 		self:setEffect(self.EFF_UNSTOPPABLE, t.getDuration(self, t), {hp_per_kill=t.getHealPercent(self,t)})
 		return true

@@ -117,49 +117,64 @@ newTalent{
 	getPower = function(self, t) return self:combatTalentScale(t, 8.5, 21.65) end,
 	action = function(self, t)
 		self:setEffect(self.EFF_BATTLE_SHOUT, t.getDur(self,t), {power=t.getPower(self, t)})
-		self:removeEffectsFilter({type="physical", status="detrimental", ignore_crosstier=true}, t.getClear(self,t))
+		self:removeEffectsFilter(self, {type="physical", status="detrimental", ignore_crosstier=true}, t.getClear(self,t))
 		
 		return true
 	end,
 	info = function(self, t)
-		return ([[Bolster yourself with a mighty battle shout, boosting your life and stamina by %0.1f%% for %d turns and curing yourself of up to %d random physical effects.
+		return ([[Bolster yourself with a mighty battle shout, boosting your maximum life and stamina by %0.1f%% for %d turns and curing yourself of up to %d random physical effects.
 		When the effect ends, the additional life and stamina will be lost.]]):
 		tformat(t.getPower(self, t), t.getDur(self, t), t.getClear(self, t))
 	end,
 }
 
 newTalent{
-	name = "Battle Cry",
-	type = {"technique/warcries", 4},
+	name = "Second Wind",
+	type = {"technique/warcries",4},
 	require = techs_req4,
 	points = 5,
-	cooldown = 30,
-	stamina = 20,
-	range = 0,
-	radius = function(self, t) return math.min(12, math.floor(self:combatTalentScale(t, 4, 8))) end,
-	target = function(self, t)
-		return {type="cone", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false}
-	end,
-	getSavesRed = function(self, t) return math.floor(self:combatTalentScale(t, 10, 30)) end,
-	getBleedRed = function(self, t) return math.min(100, math.floor(self:combatTalentScale(t, 33, 59))) end,
-	requires_target = true,
-	tactical = { DISABLE = 2 },
+	stamina = 40,
+	cooldown = 40,
+	fixed_cooldown = true,
+	tactical = { BUFF = function(self, t, aitarget)
+		local maxcount, maxlevel = t.getTalentCount(self, t), t.getMaxLevel(self, t)
+		local count, tt = 0, nil
+		for tid, _ in pairs(self.talents_cd) do
+			tt = self:getTalentFromId(tid)
+			if tt.type[1]:find("^technique/") and not tt.fixed_cooldown and tt.type[2] <= maxlevel then
+				count = count + 1
+			end
+			if count >= maxcount then break end
+		end
+		return count ^.5
+	end },
+	getTalentCount = function(self, t) return math.floor(self:combatTalentScale(t, 2, 6.5)) end,
+	getMaxLevel = function(self, t) return math.floor(self:getTalentLevel(t)) end,
 	action = function(self, t)
-		local tg = self:getTalentTarget(t)
-		local x, y = self:getTarget(tg)
-		if not x or not y then return nil end
-		self:project(tg, x, y, function(px, py)
-			local target = game.level.map(px, py, Map.ACTOR)
-			if not target then return end
-			target:setEffect(target.EFF_BATTLE_CRY, 7, {power=t.getSavesRed(self, t), bleed=t.getBleedRed(self, t), apply_power=self:combatPhysicalpower()})
-		end)
-		game.level.map:particleEmitter(self.x, self.y, self:getTalentRadius(t), "directional_shout", {life=12, size=5, tx=x-self.x, ty=y-self.y, distorion_factor=0.1, radius=self:getTalentRadius(t), nb_circles=8, rm=0.8, rM=1, gm=0.8, gM=1, bm=0.1, bM=0.2, am=0.6, aM=0.8})
+		local nb = t.getTalentCount(self, t)
+		local maxlev = t.getMaxLevel(self, t)
+		local tids = {}
+		for tid, _ in pairs(self.talents_cd) do
+			local tt = self:getTalentFromId(tid)
+			if not tt.fixed_cooldown then
+				if tt.type[2] <= maxlev and tt.type[1]:find("^technique/") then
+					tids[#tids+1] = tid
+				end
+			end
+		end
+		for i = 1, nb do
+			if #tids == 0 then break end
+			local tid = rng.tableRemove(tids)
+			self.talents_cd[tid] = nil
+		end
+		self.changed = true
+		game:playSoundNear(self, "talents/spell_generic2")
 		return true
 	end,
 	info = function(self, t)
-		return ([[Your battle cry shatters the will of your foes within a radius of %d, lowering their defense and all their saves by %d and their bleed resist by %d%% for 7 turns, making them more vulnerable.
-		All evasion and concealment bonuses are also disabled.
-		The chance to hit increases with your Physical Power.]]):
-		tformat(self:getTalentRadius(t), t.getSavesRed(self,t), t.getBleedRed(self,t))
+		local talentcount = t.getTalentCount(self, t)
+		local maxlevel = t.getMaxLevel(self, t)
+		return ([[Your mastery over combat allows you to reset the cooldown of up to %d of your techniques (that don't have a fixed cooldown) of tier %d or less.]]):
+		format(talentcount, maxlevel)
 	end,
 }
\ No newline at end of file