Merge branch 'fallen-bugfix' into 'master'

Fallen bugfix

Dirges update mastery correctly.
Prevent player from infinitely stacking Pestilence shield with enough action speed.
Prevent exploit where you could increase and decrease talent mastery at the same time you learned Fallen prodigy.

See merge request !721

@@ -43,7 +43,8 @@ newTalentType{ no_silence=true, is_spell=true, type="celestial/other", name = _t
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/dirges", name = _t("Dirges", "talent type"), description = _t"The songs the Fallen sing." }
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/dirges", name = _t("Dirges", "talent type"), description = _t"The songs the Fallen sing." }
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/darkside", name = _t("Darkside", "talent type"), description = _t"Signature magics of the Fallen.  The sun shines for the guilty and the innocent alike." }
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/darkside", name = _t("Darkside", "talent type"), description = _t"Signature magics of the Fallen.  The sun shines for the guilty and the innocent alike." }
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/dark-sun", name = _t("Dark Sun", "talent type"), description = _t"Celestial combat techniques inspired by the dark places that are not empty." }
 newTalentType{ allow_random=false, no_silence=true, is_spell=true, type="celestial/dark-sun", name = _t("Dark Sun", "talent type"), description = _t"Celestial combat techniques inspired by the dark places that are not empty." }
-newTalentType{ allow_random=false, no_silence=true, is_spell=true, generic=true, type="celestial/dirge", name = _t("Dirges", "talent type"), description = _t"Sing of death and damnation." }
+
+newTalentType{ allow_random=false, no_silence=true, is_spell=true, generic=true, type="celestial/dirge", name = _t("Dirges", "talent type"), description = _t"Sing of death and damnation.", on_mastery_change = function(self, m, tt) self.talents_types_mastery["celestial/dirges"] = self.talents_types_mastery[tt] end }
 
 
 -- Generic requires for celestial spells based on talent level
 -- Generic requires for celestial spells based on talent level
 divi_req1 = {
 divi_req1 = {

@@ -162,9 +162,9 @@ newTalent{
 	getShield = function(self, t) return self:combatTalentScale(t, 50, 200, 0.75) end,
 	getShield = function(self, t) return self:combatTalentScale(t, 50, 200, 0.75) end,
 	getShieldCD = function(self, t) return 5 end,
 	getShieldCD = function(self, t) return 5 end,
 	callbackOnTemporaryEffectAdd = function(self, t, eff_id, e_def, eff)
 	callbackOnTemporaryEffectAdd = function(self, t, eff_id, e_def, eff)
-		if not self:hasProc("dirge_shield") then
+		if not self:hasEffect(self.EFF_NO_PESTILENCE) then
 			if e_def.status == "detrimental" and e_def.type ~= "other" and eff.src ~= self then
 			if e_def.status == "detrimental" and e_def.type ~= "other" and eff.src ~= self then
-				self:setProc("dirge_shield", true, t.getShieldCD(self, t))
+				self:setEffect(self.EFF_NO_PESTILENCE, t.getShieldCD(self, t), {src=self})
 				if self:hasEffect(self.EFF_DAMAGE_SHIELD) then
 				if self:hasEffect(self.EFF_DAMAGE_SHIELD) then
 					local shield = self:hasEffect(self.EFF_DAMAGE_SHIELD)
 					local shield = self:hasEffect(self.EFF_DAMAGE_SHIELD)
 					local shield_power = self:spellCrit(t.getShield(self, t))
 					local shield_power = self:spellCrit(t.getShield(self, t))
@@ -289,7 +289,7 @@ newTalent{
 	require = divi_req3,
 	require = divi_req3,
 	points = 5,
 	points = 5,
 	mode = "passive",
 	mode = "passive",
-	getDuration = function(self, t) return self:getTalentLevel(t) end,
+	getDuration = function(self, t) return math.floor(self:getTalentLevel(t)) end,
 	getImmune = function(self, t) return self:combatTalentLimit(t, 1, 0.15, 0.50) end,
 	getImmune = function(self, t) return self:combatTalentLimit(t, 1, 0.15, 0.50) end,
 	info = function(self, t)
 	info = function(self, t)
 		return ([[Your dirges echo mournfully through the air.  When you end a dirge, you continue to gain its acolyte-level effects for %d turns.  You can only benefit from one such lingering dirge at a time.
 		return ([[Your dirges echo mournfully through the air.  When you end a dirge, you continue to gain its acolyte-level effects for %d turns.  You can only benefit from one such lingering dirge at a time.

@@ -158,7 +158,7 @@ newTalent{
 	require = cursed_wil_req4,
 	require = cursed_wil_req4,
 	points = 5,
 	points = 5,
 	mode = "passive",
 	mode = "passive",
-	getTime = function(self, t) return self:combatTalentScale(t, 3, 5) end,
+	getTime = function(self, t) return math.ceil(self:combatTalentScale(t, 3, 5)) end,
 	getThreshold = function(self, t) return self:combatTalentLimit(t, 10, 30, 15) end,
 	getThreshold = function(self, t) return self:combatTalentLimit(t, 10, 30, 15) end,
 	getSpillThreshold = function(self, t) return 40 end,
 	getSpillThreshold = function(self, t) return 40 end,
 	callbackOnTakeDamage = function(self, t, src, x, y, type, dam, state)
 	callbackOnTakeDamage = function(self, t, src, x, y, type, dam, state)

@@ -348,10 +348,10 @@ uberTalent{
 			["technique/2hweapon-assault"] = true,
 			["technique/2hweapon-assault"] = true,
 			["technique/shield-offense"] = true,
 			["technique/shield-offense"] = true,
 		}
 		}
-		if self.__increased_talent_types["technique/2hweapon-assault"] then
+		if self.__increased_talent_types["technique/2hweapon-assault"] and self.__increased_talent_types["technique/2hweapon-assault"] > 0 then
 			self.unused_talents_types = self.unused_talents_types + 1
 			self.unused_talents_types = self.unused_talents_types + 1
 		end
 		end
-		if self.__increased_talent_types["technique/shield-offense"] then
+		if self.__increased_talent_types["technique/shield-offense"] and self.__increased_talent_types["technique/shield-offense"] > 0 then
 			self.unused_talents_types = self.unused_talents_types + 1
 			self.unused_talents_types = self.unused_talents_types + 1
 		end
 		end
 		t.unlearnTalents(self, t, removes)
 		t.unlearnTalents(self, t, removes)

@@ -5509,9 +5509,9 @@ newEffect{
 	status = "beneficial",
 	status = "beneficial",
 	parameters = { shield=50, cd=5 },
 	parameters = { shield=50, cd=5 },
 	callbackOnTemporaryEffectAdd = function(self, eff, eff_id, e_def, eff_incoming)
 	callbackOnTemporaryEffectAdd = function(self, eff, eff_id, e_def, eff_incoming)
-		if not self:hasProc("dirge_shield") then
+		if not self:hasEffect(self.EFF_NO_PESTILENCE) then
 			if e_def.status == "detrimental" and e_def.type ~= "other" and eff_incoming.src ~= self then
 			if e_def.status == "detrimental" and e_def.type ~= "other" and eff_incoming.src ~= self then
-				self:setProc("dirge_shield", true, eff.cd)
+				self:setEffect(self.EFF_NO_PESTILENCE, eff.cd, {src=self})
 				if self:hasEffect(self.EFF_DAMAGE_SHIELD) then
 				if self:hasEffect(self.EFF_DAMAGE_SHIELD) then
 					local shield = self:hasEffect(self.EFF_DAMAGE_SHIELD)
 					local shield = self:hasEffect(self.EFF_DAMAGE_SHIELD)
 					local shield_power = self:spellCrit(eff.shield)
 					local shield_power = self:spellCrit(eff.shield)

@@ -4147,6 +4147,15 @@ newEffect{
 	deactivate = function(self, eff) end,
 	deactivate = function(self, eff) end,
 }
 }
 
 
+newEffect{
+	name = "NO_PESTILENCE", image = "talents/dirge_of_pestilence.png",
+	desc = _t"Pestilence Saturation",
+	long_desc = function(self, eff) return _t"The target recently benefited from Dirge of Pestilence" end,
+	type = "other",
+	subtype = { dirge=true },
+	status = "neutral",
+	parameters = { },
+}
 
 
 newEffect{
 newEffect{
 	name = "SELF_JUDGEMENT", image = "talents/self_judgement.png",
 	name = "SELF_JUDGEMENT", image = "talents/self_judgement.png",