Merge branch 'more_fixes' into 'master'

More fixes

fixed temporal bolt's initial hit reducing too many talent cooldowns
better handling for blended threads and temporal bolt (iterations aren't randomized edge)

can wait for 1.31 if needed

game/modules/tome/data/talents/chronomancy/threaded-combat.lua

@@ -157,25 +157,43 @@ newTalent{
 	callbackOnArcheryAttack = function(self, t, target, hitted)
 		if hitted then
 			if self.turn_procs.blended_threads and self.turn_procs.blended_threads >= t.getCount(self, t) then return end
-			for tid, cd in pairs(self.talents_cd) do
+			
+			-- Refresh talent
+			local tids = {}
+			for tid, _ in pairs(self.talents_cd) do
 				local tt = self:getTalentFromId(tid)
-				if tt.type[1]:find("^chronomancy/blade") then
-					self:alterTalentCoolingdown(tt, - 1)
-					self.turn_procs.blended_threads = (self.turn_procs.blended_threads or 0) + 1
+				if tt.type[1]:find("^chronomancy/blade") and not tt.fixed_cooldown then
+					tids[#tids+1] = tt
 				end
 			end
+
+			if #tids > 0 then
+				local tid = rng.tableRemove(tids)
+				self:alterTalentCoolingdown(tid, - 1)
+				self.turn_procs.blended_threads = (self.turn_procs.blended_threads or 0) + 1
+			end
+			
 		end
 	end,
 	callbackOnMeleeAttack = function(self, t, target, hitted)
 		if hitted then
 			if self.turn_procs.blended_threads and self.turn_procs.blended_threads >= t.getCount(self, t) then return end
-			for tid, cd in pairs(self.talents_cd) do
+			
+			-- Refresh talent
+			local tids = {}
+			for tid, _ in pairs(self.talents_cd) do
 				local tt = self:getTalentFromId(tid)
-				if tt.type[1]:find("^chronomancy/bow") then
-					self:alterTalentCoolingdown(tt, - 1)
-					self.turn_procs.blended_threads = (self.turn_procs.blended_threads or 0) + 1
+				if tt.type[1]:find("^chronomancy/bow") and not tt.fixed_cooldown then
+					tids[#tids+1] = tt
 				end
 			end
+
+			if #tids > 0 then
+				local tid = rng.tableRemove(tids)
+				self:alterTalentCoolingdown(tid, - 1)
+				self.turn_procs.blended_threads = (self.turn_procs.blended_threads or 0) + 1
+			end
+			
 		end
 	end,
 	info = function(self, t)

game/modules/tome/data/talents/chronomancy/timetravel.lua

@@ -50,13 +50,20 @@ newTalent{
 		self:project(tg, x, y, function(px, py)
 			local target = game.level.map(px, py, Map.ACTOR)
 			if not target then return end
+			
 			-- Refresh talent
-			for tid, cd in pairs(self.talents_cd) do
+			local tids = {}
+			for tid, _ in pairs(self.talents_cd) do
 				local tt = self:getTalentFromId(tid)
 				if tt.type[1]:find("^chronomancy/") and not tt.fixed_cooldown then
-					self:alterTalentCoolingdown(tt, - cdr)
+					tids[#tids+1] = tt
 				end
 			end
+			if #tids > 0 then
+				local tid = rng.tableRemove(tids)
+				self:alterTalentCoolingdown(tid, - cdr)
+			end
+			
 			DamageType:get(DamageType.TEMPORAL).projector(self, x, y, DamageType.TEMPORAL, dam)
 		end)
 		
@@ -77,13 +84,17 @@ newTalent{
 						src:project({type="hit", selffire=false, talent=talent}, self.x, self.y, DT.TEMPORAL, dam)
 
 						-- Refresh talent
-						for tid, cd in pairs(src.talents_cd) do
+						local tids = {}
+						for tid, _ in pairs(src.talents_cd) do
 							local tt = src:getTalentFromId(tid)
 							if tt.type[1]:find("^chronomancy/") and not tt.fixed_cooldown then
-								src:alterTalentCoolingdown(tt, - self.def.cdr)
-								break
+								tids[#tids+1] = tt
 							end
 						end
+						if #tids > 0 then
+							local tid = rng.tableRemove(tids)
+							src:alterTalentCoolingdown(tid, - self.def.cdr)
+						end
 					end
 				end,
 				function(self, src)