From 634af5f1f4fc8b236599ae4c34dab561f725fe05 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 27 Dec 2012 20:46:28 +0000
Subject: [PATCH] Drying with Precognition doesnt kill you
git-svn-id: http://svn.net-core.org/repos/t-engine4@6251 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Player.lua | 5 -----
game/modules/tome/class/interface/ActorLife.lua | 5 +++++
game/modules/tome/data/general/objects/cloth-armors.lua | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index 5dd2de0c20..f789996be2 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 13690c4d1e..6916565a38 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 3ef51efc2b..669ed8f770 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,
--
GitLab