# HG changeset patch # User Eric # Date 1313027386 18000 # Node ID cf7d6fa3ee9d2c64be88c8a8d5ce3009e389c878 # Parent 83b2b199ac2415282ac968a30367e2517b12cc1c suppression fix diff -r 83b2b199ac24 -r cf7d6fa3ee9d game/modules/tome/class/Actor.lua --- a/game/modules/tome/class/Actor.lua Wed Aug 10 16:45:25 2011 +0000 +++ b/game/modules/tome/class/Actor.lua Wed Aug 10 20:49:46 2011 -0500 @@ -2851,6 +2851,10 @@ local fft = self:hasEffect(self.EFF_FADE_FROM_TIME) p.dur = math.ceil(p.dur * (1 - (fft.power/100))) end + if e.status == "detrimental" and e.type ~= "magical" and self:knowTalent(self.T_SUPPRESSION) then + local t = self:getTalentFromId(self.T_SUPPRESSION) + p.dur = math.ceil(p.dur * (1 - (t.getPercent(self, t)/100))) + end if e.status == "detrimental" and self:attr("negative_status_effect_immune") then p.dur = 0 end diff -r 83b2b199ac24 -r cf7d6fa3ee9d game/modules/tome/class/Player.lua --- a/game/modules/tome/class/Player.lua Wed Aug 10 16:45:25 2011 +0000 +++ b/game/modules/tome/class/Player.lua Wed Aug 10 20:49:46 2011 -0500 @@ -499,8 +499,8 @@ -- Check resources, make sure they CAN go up, otherwise we will never stop if not self.resting.rest_turns then - if self.air_regen < 0 then return false, "loosing breath!" end - if self.life_regen <= 0 then return false, "loosing health!" end + if self.air_regen < 0 then return false, "losing breath!" end + if self.life_regen <= 0 then return false, "losing health!" end if self:getMana() < self:getMaxMana() and self.mana_regen > 0 then return true end if self:getStamina() < self:getMaxStamina() and self.stamina_regen > 0 then return true end if self.life < self.max_life and self.life_regen> 0 then return true end