From 350c1d3ec83c2293ac9f87da1c615ee6e4f1048e Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 28 Dec 2010 20:53:33 +0000
Subject: [PATCH] "Normal mode" did not provide all the lifes it should

git-svn-id: http://svn.net-core.org/repos/t-engine4@2217 51575b47-30f0-44d4-a5cc-537603b46e54
---
 game/modules/tome/class/Player.lua        | 2 +-
 game/modules/tome/dialogs/DeathDialog.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index f49ecef901..a2c53b1d24 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -447,7 +447,7 @@ function _M:levelup()
 	if self.level == 40 then world:gainAchievement("LEVEL_40", self) end
 	if self.level == 50 then world:gainAchievement("LEVEL_50", self) end
 
-	if game.difficulty == game.DIFFICULTY_EASY and (
+	if (game.difficulty == game.DIFFICULTY_EASY or game.difficulty == game.DIFFICULTY_NORMAL) and (
 		self.level == 2 or
 		self.level == 3 or
 		self.level == 5 or
diff --git a/game/modules/tome/dialogs/DeathDialog.lua b/game/modules/tome/dialogs/DeathDialog.lua
index d1a7fcc9ad..58047ec5b3 100644
--- a/game/modules/tome/dialogs/DeathDialog.lua
+++ b/game/modules/tome/dialogs/DeathDialog.lua
@@ -167,7 +167,7 @@ function _M:generateList()
 
 	if config.settings.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
 	if not self.actor.no_resurrect then
-		if self.actor:attr("easy_mode_lifes") then list[#list+1] = {name=("Resurrect with easy mode (%d left)"):format(self.actor.easy_mode_lifes), action="easy_mode"} end
+		if self.actor:attr("easy_mode_lifes") then list[#list+1] = {name=("Resurrect (%d left)"):format(self.actor.easy_mode_lifes), action="easy_mode"} end
 		if self.actor:attr("blood_life") and not self.actor:attr("undead") then list[#list+1] = {name="Resurrect with the Blood of Life", action="blood_life"} end
 		if self.actor:getTalentLevelRaw(self.actor.T_SKELETON_REASSEMBLE) >= 5 and not self.actor:attr("re-assembled") then list[#list+1] = {name="Re-assemble your bones and resurrect (Skeleton ability)", action="skeleton"} end
 
-- 
GitLab