Merge branch 'no-infinite-heroism' into 'master'

Prevent Heroism lost life bonus from chaining infinitely.



See merge request !757

@@ -233,18 +233,18 @@ newInscription{
 	tactical = { DEFEND = 1 },
 	tactical = { DEFEND = 1 },
 	action = function(self, t)
 	action = function(self, t)
 		local data = self:getInscriptionData(t.short_name)
 		local data = self:getInscriptionData(t.short_name)
-		local bonus = 1 + (1 - self.life / self.max_life)
+		local bonus = 1 + (1 - math.max(0, self.life) / self.max_life)
 		self:setEffect(self.EFF_HEROISM, math.floor(data.dur * bonus), {die_at=(data.die_at + data.inc_stat * 30) * bonus})
 		self:setEffect(self.EFF_HEROISM, math.floor(data.dur * bonus), {die_at=(data.die_at + data.inc_stat * 30) * bonus})
 		return true
 		return true
 	end,
 	end,
 	info = function(self, t)
 	info = function(self, t)
 		local data = self:getInscriptionData(t.short_name)
 		local data = self:getInscriptionData(t.short_name)
-		local bonus = 1 + (1 - self.life / self.max_life)
+		local bonus = 1 + (1 -  math.max(0, self.life) / self.max_life)
 		local bonus1 = (data.die_at + data.inc_stat * 30) * bonus
 		local bonus1 = (data.die_at + data.inc_stat * 30) * bonus
 		local bonus2 = math.floor(data.dur * bonus)
 		local bonus2 = math.floor(data.dur * bonus)
 		return ([[Activate the infusion to endure even the most grievous of wounds for %d turns.
 		return ([[Activate the infusion to endure even the most grievous of wounds for %d turns.
 		While Heroism is active, you will only die when reaching -%d life.
 		While Heroism is active, you will only die when reaching -%d life.
-		The duration and life will increase by 1%% for every 1%% life you have lost (currently %d life, %d duration)
+		The duration and life will increase by 1%% for every 1%% life you have lost, to a maximum of 100%% at 0 life or less (currently %d life, %d duration)
 		If your life is below 0 when this effect wears off it will be set to 1.]]):tformat(data.dur, data.die_at + data.inc_stat * 30, bonus1, bonus2)
 		If your life is below 0 when this effect wears off it will be set to 1.]]):tformat(data.dur, data.die_at + data.inc_stat * 30, bonus1, bonus2)
 	end,
 	end,
 	short_info = function(self, t)
 	short_info = function(self, t)