summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-03-04 06:14:00 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-03-04 06:14:00 +0000
commitf07cfeff7bcf84029b7117943eb948096647e4b2 (patch)
treed85ef8e8e914b1cb7a55d69260eb946d514ae159 /src
parentee5830a18757f5b34890a27a239e6a9214f8ac62 (diff)
downloadmana-client-f07cfeff7bcf84029b7117943eb948096647e4b2.tar.gz
mana-client-f07cfeff7bcf84029b7117943eb948096647e4b2.tar.bz2
mana-client-f07cfeff7bcf84029b7117943eb948096647e4b2.tar.xz
mana-client-f07cfeff7bcf84029b7117943eb948096647e4b2.zip
Added HP regeneration and new death messages.
Diffstat (limited to 'src')
-rw-r--r--src/localplayer.h15
-rw-r--r--src/net/beinghandler.cpp5
2 files changed, 12 insertions, 8 deletions
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));