Added HP regeneration and new death messages.

3 files changed, 18 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7146d4f4..5b433fe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-03-03  Philipp Sehmisch  <tmw@crushnet.org>
 
+	* src/localplayer.h: Added natural HP regeneration
+	* src/net/beinghandler.cpp: Added 3 new death messages which were
+	suggested by dabe and blueberry on the forum.
+
+2008-03-03  Philipp Sehmisch  <tmw@crushnet.org>
+
 	* src/gui/skill.cpp, src/gui/skill.h: Skill gui beautifications by
 	roderic.
 	* src/localplayer.cpp: Made skill names translateable.
diff --git a/src/localplayer.h b/src/localplayer.h
index d850ed5f..9b4c7eb3 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -49,6 +49,7 @@ BASE_ATTR_BEGIN = 0,
     BASE_ATTR_EVADE,   /**< Ability to avoid hits. */
     BASE_ATTR_HIT,     /**< Ability to hit stuff. */
     BASE_ATTR_HP,      /**< Hit Points (Base value: maximum, Modded value: current) */
+    BASE_ATTR_HP_REGEN,/**< number of HP regenerated every 10 game ticks */
     BASE_ATTR_END,
     BASE_ATTR_NB = BASE_ATTR_END - BASE_ATTR_BEGIN,
 
@@ -150,34 +151,34 @@ class LocalPlayer : public Player
          */
         virtual void
         drawName(Graphics *, int, int) {};
-    
+
         /**
          * Adds a guild to the local player.
          */
         void addGuild(short guildId, bool inviteRights);
-    
+
         /**
          * Removers a guild from the local player.
          */
         void removeGuild(short guildId);
-    
+
         /**
          * Finds a guild the local player belongs to, by the guildId
          * @return returns the guild associated with the guildId
          */
         Guild* findGuildById(short guildId);
-    
+
         /**
          * Finds a guild the local player belongs to, by the guild's name.
          * @return returns the guild with that name
          */
         Guild* findGuildByName(const std::string &guildName);
-    
+
         /**
          * Get number of guilds the player belongs to
          */
         short getNumberOfGuilds();
-    
+
         /**
          * Check the player has permission to invite users
          */
@@ -367,7 +368,7 @@ class LocalPlayer : public Player
 
     protected:
         void walk(unsigned char dir);
-    
+
         // Character guild information
         std::vector<Guild*> mGuilds;
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 25d7b6a0..3e55cce9 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -617,9 +617,12 @@ void BeingHandler::handleBeingActionChangeMessage(MessageIn &msg)
             _("I guess this did not run too well."),
             _("Do you want your possessions identified?"), // Nethack reference
             _("Sadly, no trace of you was ever found..."), // Secret of Mana reference
+            _("Annihilated."), // Final Fantasy VI reference
+            _("Looks like you got your head handed to you."), //Earthbound reference
+            _("You screwed up again, dump your body down the tubes and get you another one.") // Leisure Suit Larry 1 Reference
 
         };
-        std::string message(deadMsg[rand()%10]);
+        std::string message(deadMsg[rand()%13]);
         message.append(_(" Press OK to respawn"));
         OkDialog *dlg = new OkDialog(_("You died"), message);
         dlg->addActionListener(&(Net::GameServer::Player::respawnListener));