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

@@ -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
 

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

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,