diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua index 5dd2de0c20091d43abfbcfbe377e99beaf7e1252..f789996be2b5f167e91b657fa093cf9e59f8b5c7 100644 --- a/game/modules/tome/class/Player.lua +++ b/game/modules/tome/class/Player.lua @@ -600,11 +600,6 @@ function _M:die(src, death_note) if self.runStop then self:runStop("died") end if self.restStop then self:restStop("died") end - if self:hasEffect(self.EFF_PRECOGNITION) then - self:removeEffect(self.EFF_PRECOGNITION) - return - end - return self:onPartyDeath(src, death_note) end diff --git a/game/modules/tome/class/interface/ActorLife.lua b/game/modules/tome/class/interface/ActorLife.lua index 13690c4d1e898ec2388c203cce60284f7b4519f4..6916565a38a5e0ccbe54d3940a63c2a6acd9364a 100644 --- a/game/modules/tome/class/interface/ActorLife.lua +++ b/game/modules/tome/class/interface/ActorLife.lua @@ -39,5 +39,10 @@ function _M:takeHit(value, src, death_note) return self:die(src, death_note), value end end + if self:hasEffect(self.EFF_PRECOGNITION) then + game.log("%s dies during his precognition, ending the effect!", self.name:capitalize()) + self:removeEffect(self.EFF_PRECOGNITION) + return false, 0 + end return false, value end \ No newline at end of file diff --git a/game/modules/tome/data/general/objects/cloth-armors.lua b/game/modules/tome/data/general/objects/cloth-armors.lua index 3ef51efc2b2fbaf6380e0c9597ffcf85636cd3cb..669ed8f7703ad8159338aaf8ae1135c013ce2a3f 100644 --- a/game/modules/tome/data/general/objects/cloth-armors.lua +++ b/game/modules/tome/data/general/objects/cloth-armors.lua @@ -39,7 +39,7 @@ newEntity{ base = "BASE_CLOTH_ARMOR", } newEntity{ base = "BASE_CLOTH_ARMOR", - name = "woollen robe", short_name = "wollen", + name = "woollen robe", short_name = "woollen", level_range = {10, 20}, cost = 1.5, material_level = 2,