Merge branch 'fixed_cooldown' into 'master'

Fixed cooldown fix

Previously, Contigency allowed bypassing fixed cooldowns and Matrix allowed reducing fixed cooldowns. In the case of Matrix, there was an attempt to filter out fixed cooldowns, but due to a typo they were not being filtered. Contingency did not have a similar condition, which I assume was an oversight.

Now, Contingency and Matrix will filter out talents with fixed_cooldown==true.

I think this could be included in 1.3.2.

game/modules/tome/dialogs/talents/ChronomancyContingency.lua

@@ -116,7 +116,7 @@ function _M:generateList()
 
 	-- Generate lists of all talents by category
 	for j, t in pairs(self.actor.talents_def) do
-		if self.actor:knowTalent(t.id) and t.mode == "activated" and t.is_spell and not t.requires_target and not t.hide then
+		if self.actor:knowTalent(t.id) and t.mode == "activated" and t.is_spell and not t.requires_target and not t.hide and not t.fixed_cooldown then
 			local nodes = talents
 			local status = tstring{{"color", "LIGHT_GREEN"}, "Talents"}
 			

game/modules/tome/dialogs/talents/ChronomancyMatrix.lua

@@ -130,7 +130,7 @@ function _M:generateList()
 
 	-- Generate lists of all talents by category
 	for j, t in pairs(self.actor.talents_def) do
-		if self.actor:knowTalent(t.id) and t.type[1]:find("^chronomancy/") and not t.type[1]:find("^chronomancy/spellbinding") and not t.hide and t.cooldown and t.mode ~= "passive" and not t.fixed_cooldownand and not spellbound(self.actor, t.id) then
+		if self.actor:knowTalent(t.id) and t.type[1]:find("^chronomancy/") and not t.type[1]:find("^chronomancy/spellbinding") and not t.hide and t.cooldown and not t.fixed_cooldown and t.mode ~= "passive" and not spellbound(self.actor, t.id) then
 			local nodes = talents
 			local status = tstring{{"color", "LIGHT_GREEN"}, "Talents"}