diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
commit | 63b4c9869b6256ed7644113cd23305b07cf9df03 (patch) | |
tree | aff0d99f5b58cbaf4195ac755ecfb79f97bf7b65 /src/net | |
parent | 8c4c5a58c256cce7beb21b68c8a7d6b6ff5c4a3a (diff) | |
parent | 2953a3f92c5097bd99ff21f4536fe167a32d90c5 (diff) | |
download | mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.gz mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.bz2 mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.xz mana-client-63b4c9869b6256ed7644113cd23305b07cf9df03.zip |
Merge branch '1.0'
Conflicts:
src/beingmanager.cpp
src/beingmanager.h
src/client.cpp
src/localplayer.cpp
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/manaserv/beinghandler.cpp | 2 | ||||
-rw-r--r-- | src/net/manaserv/charhandler.cpp | 6 | ||||
-rw-r--r-- | src/net/manaserv/generalhandler.cpp | 27 | ||||
-rw-r--r-- | src/net/manaserv/loginhandler.cpp | 8 | ||||
-rw-r--r-- | src/net/manaserv/npchandler.cpp | 5 | ||||
-rw-r--r-- | src/net/manaserv/npchandler.h | 2 | ||||
-rw-r--r-- | src/net/manaserv/playerhandler.cpp | 5 | ||||
-rw-r--r-- | src/net/manaserv/protocol.h | 115 | ||||
-rw-r--r-- | src/net/manaserv/stats.cpp | 202 | ||||
-rw-r--r-- | src/net/manaserv/stats.h | 36 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 40 | ||||
-rw-r--r-- | src/net/tmwa/npchandler.cpp | 5 | ||||
-rw-r--r-- | src/net/tmwa/npchandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/playerhandler.cpp | 5 |
14 files changed, 386 insertions, 74 deletions
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp index 8d3ed21b..705074c1 100644 --- a/src/net/manaserv/beinghandler.cpp +++ b/src/net/manaserv/beinghandler.cpp @@ -159,7 +159,7 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg) switch (type) { - case OBJECT_PLAYER: + case OBJECT_CHARACTER: { std::string name = msg.readString(); if (player_node->getName() == name) diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp index f8a1ac89..721780d2 100644 --- a/src/net/manaserv/charhandler.cpp +++ b/src/net/manaserv/charhandler.cpp @@ -150,13 +150,13 @@ void CharHandler::handleCharacterCreateResponse(Net::MessageIn &msg) case CREATE_INVALID_GENDER: errorMessage = _("Invalid gender."); break; - case CREATE_RAW_STATS_TOO_HIGH: + case CREATE_ATTRIBUTES_TOO_HIGH: errorMessage = _("Character's stats are too high."); break; - case CREATE_RAW_STATS_TOO_LOW: + case CREATE_ATTRIBUTES_TOO_LOW: errorMessage = _("Character's stats are too low."); break; - case CREATE_RAW_STATS_EQUAL_TO_ZERO: + case CREATE_ATTRIBUTES_EQUAL_TO_ZERO: errorMessage = _("One stat is zero."); break; default: diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index 454052f7..09f68c1e 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -29,7 +29,6 @@ #include "gui/register.h" #include "gui/skilldialog.h" #include "gui/specialswindow.h" -#include "gui/statuswindow.h" #include "net/manaserv/beinghandler.h" #include "net/manaserv/buysellhandler.h" @@ -47,6 +46,7 @@ #include "net/manaserv/partyhandler.h" #include "net/manaserv/playerhandler.h" #include "net/manaserv/specialhandler.h" +#include "net/manaserv/stats.h" #include "net/manaserv/tradehandler.h" #include "utils/gettext.h" @@ -90,16 +90,6 @@ GeneralHandler::GeneralHandler(): chatServerConnection = getConnection(); generalHandler = this; - - std::list<ItemDB::Stat> stats; - stats.push_back(ItemDB::Stat("str", N_("Strength %+d"))); - stats.push_back(ItemDB::Stat("agi", N_("Agility %+d"))); - stats.push_back(ItemDB::Stat("dex", N_("Dexterity %+d"))); - stats.push_back(ItemDB::Stat("vit", N_("Vitality %+d"))); - stats.push_back(ItemDB::Stat("int", N_("Intelligence %+d"))); - stats.push_back(ItemDB::Stat("will", N_("Willpower %+d"))); - - ItemDB::setStatsList(stats); } void GeneralHandler::load() @@ -118,6 +108,9 @@ void GeneralHandler::load() registerHandler(mPartyHandler.get()); registerHandler(mPlayerHandler.get()); registerHandler(mTradeHandler.get()); + + Stats::load(); + Stats::informItemDB(); } void GeneralHandler::reload() @@ -136,6 +129,10 @@ void GeneralHandler::reload() netToken.clear(); gameServer.clear(); chatServer.clear(); + + Stats::unload(); + Stats::load(); + Stats::informItemDB(); } void GeneralHandler::unload() @@ -153,6 +150,7 @@ void GeneralHandler::unload() delete gameServerConnection; delete chatServerConnection; + Stats::unload(); finalize(); } @@ -176,12 +174,7 @@ void GeneralHandler::guiWindowsLoaded() player_node->setExpNeeded(100); - statusWindow->addAttribute(16, _("Strength"), true); - statusWindow->addAttribute(17, _("Agility"), true); - statusWindow->addAttribute(18, _("Dexterity"), true); - statusWindow->addAttribute(19, _("Vitality"), true); - statusWindow->addAttribute(20, _("Intelligence"), true); - statusWindow->addAttribute(21, _("Willpower"), true); + Stats::informStatusWindow(); } void GeneralHandler::guiWindowsUnloaded() diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp index e51aef6f..cb25f584 100644 --- a/src/net/manaserv/loginhandler.cpp +++ b/src/net/manaserv/loginhandler.cpp @@ -89,8 +89,8 @@ void LoginHandler::handleMessage(Net::MessageIn &msg) case ERRMSG_FAILURE: errorMessage = _("Already logged in."); break; - case LOGIN_SERVER_FULL: - errorMessage = _("Server is full."); + case LOGIN_BANNED: + errorMessage = _("Account banned."); break; default: errorMessage = _("Unknown error."); @@ -268,8 +268,8 @@ void LoginHandler::handleLoginResponse(Net::MessageIn &msg) case ERRMSG_FAILURE: errorMessage = _("Already logged in."); break; - case LOGIN_SERVER_FULL: - errorMessage = _("Server is full."); + case LOGIN_BANNED: + errorMessage = _("Account banned"); break; case LOGIN_INVALID_TIME: errorMessage = _("Login attempt too soon after previous " diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp index cb8aef4c..6c4a2706 100644 --- a/src/net/manaserv/npchandler.cpp +++ b/src/net/manaserv/npchandler.cpp @@ -224,4 +224,9 @@ void NpcHandler::endShopping(int beingId) // TODO } +void NpcHandler::clearDialogs() +{ + mNpcDialogs.clear(); +} + } // namespace ManaServ diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h index 7f48c738..689fdc1d 100644 --- a/src/net/manaserv/npchandler.h +++ b/src/net/manaserv/npchandler.h @@ -66,6 +66,8 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler void endShopping(int beingId); + void clearDialogs(); + private: typedef struct { NpcDialog* dialog; diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index 4514366a..60fa5b29 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -39,6 +39,7 @@ #include "net/manaserv/connection.h" #include "net/manaserv/messagein.h" #include "net/manaserv/messageout.h" +#include "net/manaserv/npchandler.h" #include "net/manaserv/protocol.h" /** @@ -56,6 +57,10 @@ namespace ManaServ { void RespawnRequestListener::action(const gcn::ActionEvent &event) { Net::getPlayerHandler()->respawn(); + + ManaServ::NpcHandler *handler = + static_cast<ManaServ::NpcHandler*>(Net::getNpcHandler()); + handler->clearDialogs(); } extern Connection *gameServerConnection; diff --git a/src/net/manaserv/protocol.h b/src/net/manaserv/protocol.h index dc120fa2..226a27a0 100644 --- a/src/net/manaserv/protocol.h +++ b/src/net/manaserv/protocol.h @@ -31,23 +31,26 @@ * - CPMSG_*: from chat server to client * - PGMSG_*: from client to game server * - GPMSG_*: from game server to client + * - GAMSG_*: from game server to account server * * Components: B byte, W word, D double word, S variable-size string * C tile-based coordinates (B*3) * * Hosts: P (player's client), A (account server), C (char server), * G (game server) + * + * TODO - Document specific error codes for each packet */ enum { // Login/Register - PAMSG_REGISTER = 0x0000, // L version, S username, S password, S email, S captcha response - APMSG_REGISTER_RESPONSE = 0x0002, // B error [, S updatehost] - PAMSG_UNREGISTER = 0x0003, // - + PAMSG_REGISTER = 0x0000, // D version, S username, S password, S email, S captcha response + APMSG_REGISTER_RESPONSE = 0x0002, // B error, [S updatehost] + PAMSG_UNREGISTER = 0x0003, // S username, S password APMSG_UNREGISTER_RESPONSE = 0x0004, // B error PAMSG_REQUEST_REGISTER_INFO = 0x0005, // - APMSG_REGISTER_INFO_RESPONSE = 0x0006, // B byte registrationAllowed, byte minNameLength, byte maxNameLength, string captchaURL, string captchaInstructions - PAMSG_LOGIN = 0x0010, // L version, S username, S password - APMSG_LOGIN_RESPONSE = 0x0012, // B error [, S updatehost] + APMSG_REGISTER_INFO_RESPONSE = 0x0006, // B byte registration Allowed, byte minNameLength, byte maxNameLength, string captchaURL, string captchaInstructions + PAMSG_LOGIN = 0x0010, // D version, S username, S password + APMSG_LOGIN_RESPONSE = 0x0012, // B error, [S updatehost] PAMSG_LOGOUT = 0x0013, // - APMSG_LOGOUT_RESPONSE = 0x0014, // B error PAMSG_CHAR_CREATE = 0x0020, // S name, B hair style, B hair color, B gender, W*6 stats @@ -87,7 +90,7 @@ enum { GPMSG_INVENTORY_FULL = 0x0121, // { B slot, W item id [, B amount] }* GPMSG_PLAYER_ATTRIBUTE_CHANGE = 0x0130, // { W attribute, W base value, W modified value }* GPMSG_PLAYER_EXP_CHANGE = 0x0140, // { W skill, D exp got, D exp needed }* - GPMSG_LEVELUP = 0x0150, // W new level + GPMSG_LEVELUP = 0x0150, // W new level, W character points, W correction points GPMSG_LEVEL_PROGRESS = 0x0151, // B percent completed to next levelup PGMSG_RAISE_ATTRIBUTE = 0x0160, // B attribute GPMSG_RAISE_ATTRIBUTE_RESPONSE = 0x0161, // B error, B attribute @@ -95,7 +98,7 @@ enum { GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, B attribute PGMSG_RESPAWN = 0x0180, // - GPMSG_BEING_ENTER = 0x0200, // B type, W being id, B action, W*2 position - // player: S name, B hair style, B hair color, B gender, B item bitmask, { W item id }* + // character: S name, B hair style, B hair color, B gender, B item bitmask, { W item id }* // monster: W type id // npc: W type id GPMSG_BEING_LEAVE = 0x0201, // W being id @@ -106,12 +109,13 @@ enum { GPMSG_BEING_ACTION_CHANGE = 0x0271, // W being id, B action PGMSG_DIRECTION_CHANGE = 0x0272, // B Direction GPMSG_BEING_DIR_CHANGE = 0x0273, // W being id, B direction + GPMSG_BEING_HEALTH_CHANGE = 0x0274, // W being id, W health GPMSG_BEINGS_MOVE = 0x0280, // { W being id, B flags [, W*2 position, B speed] }* GPMSG_ITEMS = 0x0281, // { W item id, W*2 position }* PGMSG_ATTACK = 0x0290, // W being id - GPMSG_BEING_ATTACK = 0x0291, // W being id + GPMSG_BEING_ATTACK = 0x0291, // W being id, B direction, B attacktype PGMSG_USE_SPECIAL = 0x0292, // B specialID - GPMSG_SPECIAL_STATUS = 0x0293, // { B specialID, L current, L max, L recharge } + GPMSG_SPECIAL_STATUS = 0x0293, // { B specialID, D current, D max, D recharge } PGMSG_SAY = 0x02A0, // S text GPMSG_SAY = 0x02A1, // W being id, S text GPMSG_NPC_CHOICE = 0x02B0, // W being id, { S text }* @@ -125,11 +129,11 @@ enum { GPMSG_NPC_ERROR = 0x02B8, // B error GPMSG_NPC_CLOSE = 0x02B9, // W being id GPMSG_NPC_POST = 0x02D0, // W being id - PGMSG_NPC_POST_SEND = 0x02D1, // S name, S text, W item id + PGMSG_NPC_POST_SEND = 0x02D1, // W being id, { S name, S text, W item id } GPMSG_NPC_POST_GET = 0x02D2, // W being id, { S name, S text, W item id } - PGMSG_NPC_NUMBER = 0x02D3, // W being id, L number + PGMSG_NPC_NUMBER = 0x02D3, // W being id, D number PGMSG_NPC_STRING = 0x02D4, // W being id, S string - GPMSG_NPC_NUMBER = 0x02D5, // W being id, L max, L min, L default + GPMSG_NPC_NUMBER = 0x02D5, // W being id, D max, D min, D default GPMSG_NPC_STRING = 0x02D6, // W being id PGMSG_TRADE_REQUEST = 0x02C0, // W being id GPMSG_TRADE_REQUEST = 0x02C1, // W being id @@ -143,8 +147,8 @@ enum { GPMSG_TRADE_CONFIRM = 0x02C9, // - PGMSG_TRADE_ADD_ITEM = 0x02CA, // B slot, B amount GPMSG_TRADE_ADD_ITEM = 0x02CB, // W item id, B amount - PGMSG_TRADE_SET_MONEY = 0x02CC, // L amount - GPMSG_TRADE_SET_MONEY = 0x02CD, // L amount + PGMSG_TRADE_SET_MONEY = 0x02CC, // D amount + GPMSG_TRADE_SET_MONEY = 0x02CD, // D amount GPMSG_TRADE_BOTH_CONFIRM = 0x02CE, // - PGMSG_USE_ITEM = 0x0300, // B slot GPMSG_USE_RESPONSE = 0x0301, // B error @@ -174,7 +178,7 @@ enum { // Party PCMSG_PARTY_INVITE = 0x03A0, // S name - CPMSG_PARTY_INVITE_RESPONSE = 0x03A1, // B error + CPMSG_PARTY_INVITE_RESPONSE = 0x03A1, // B error, S name CPMSG_PARTY_INVITED = 0x03A2, // S name PCMSG_PARTY_ACCEPT_INVITE = 0x03A5, // S name CPMSG_PARTY_ACCEPT_INVITE_RESPONSE = 0x03A6, // B error, { S name } @@ -207,10 +211,34 @@ enum { PCMSG_LIST_CHANNELUSERS = 0x0460, // S channel CPMSG_LIST_CHANNELUSERS_RESPONSE = 0x0461, // S channel, { S user, B mode } PCMSG_TOPIC_CHANGE = 0x0462, // W channel id, S topic - // -- User mode + // -- User modes PCMSG_USER_MODE = 0x0465, // W channel id, S name, B mode PCMSG_KICK_USER = 0x0466, // W channel id, S name + // Inter-server + GAMSG_REGISTER = 0x0500, // S address, W port, S password, D items db revision, { W map id }* + AGMSG_REGISTER_RESPONSE = 0x0501, // C item version, C password response + AGMSG_ACTIVE_MAP = 0x0502, // W map id + AGMSG_PLAYER_ENTER = 0x0510, // B*32 token, D id, S name, serialised character data + GAMSG_PLAYER_DATA = 0x0520, // D id, serialised character data + GAMSG_REDIRECT = 0x0530, // D id + AGMSG_REDIRECT_RESPONSE = 0x0531, // D id, B*32 token, S game address, W game port + GAMSG_PLAYER_RECONNECT = 0x0532, // D id, B*32 token + GAMSG_PLAYER_SYNC = 0x0533, // serialised sync data + GAMSG_SET_QUEST = 0x0540, // D id, S name, S value + GAMSG_GET_QUEST = 0x0541, // D id, S name + AGMSG_GET_QUEST_RESPONSE = 0x0542, // D id, S name, S value + GAMSG_BAN_PLAYER = 0x0550, // D id, W duration + GAMSG_CHANGE_PLAYER_LEVEL = 0x0555, // D id, W level + GAMSG_CHANGE_ACCOUNT_LEVEL = 0x0556, // D id, W level + GAMSG_STATISTICS = 0x0560, // { W map id, W thing nb, W monster nb, W player nb, { D character id }* }* + CGMSG_CHANGED_PARTY = 0x0590, // D character id, D party id + GCMSG_REQUEST_POST = 0x05A0, // D character id + CGMSG_POST_RESPONSE = 0x05A1, // D receiver id, { S sender name, S letter, W num attachments { W attachment item id, W quantity } } + GCMSG_STORE_POST = 0x05A5, // D sender id, S receiver name, S letter, { W attachment item id, W quantity } + CGMSG_STORE_POST_RESPONSE = 0x05A6, // D id, B error + GAMSG_TRANSACTION = 0x0600, // D character id, D action, S message + XXMSG_INVALID = 0x7FFF }; @@ -226,14 +254,35 @@ enum { ERRMSG_EMAIL_ALREADY_EXISTS, // The Email Address already exists ERRMSG_ALREADY_TAKEN, // name used was already taken ERRMSG_SERVER_FULL, // the server is overloaded - ERRMSG_TIME_OUT // data failed to arrive in due time + ERRMSG_TIME_OUT, // data failed to arrive in due time + ERRMSG_LIMIT_REACHED // limit reached +}; + +// used in AGMSG_REGISTER_RESPONSE to show state of item db +enum { + DATA_VERSION_OK = 0x00, + DATA_VERSION_OUTDATED = 0x01 +}; + +// used in AGMSG_REGISTER_RESPNSE to show if password was accepted +enum { + PASSWORD_OK = 0x00, + PASSWORD_BAD = 0x01 +}; + +// used to identify part of sync message +enum { + SYNC_CHARACTER_POINTS = 0x01, // D charId, D charPoints, D corrPoints, B attribute id, D attribute value + SYNC_CHARACTER_SKILL = 0x02, // D charId, B skillId, D skill value + SYNC_ONLINE_STATUS = 0x03, // D charId, B 0x00 = offline, 0x01 = online + SYNC_END_OF_BUFFER = 0xFF // shows, that the buffer ends here. }; // Login specific return values enum { LOGIN_INVALID_VERSION = 0x40, // the user is using an incompatible protocol LOGIN_INVALID_TIME = 0x50, // the user tried logging in too fast - LOGIN_SERVER_FULL // the server is overloaded + LOGIN_BANNED // the user is currently banned }; // Account register specific return values @@ -249,9 +298,9 @@ enum { CREATE_INVALID_HAIRSTYLE = 0x40, CREATE_INVALID_HAIRCOLOR, CREATE_INVALID_GENDER, - CREATE_RAW_STATS_TOO_HIGH, - CREATE_RAW_STATS_TOO_LOW, - CREATE_RAW_STATS_EQUAL_TO_ZERO, + CREATE_ATTRIBUTES_TOO_HIGH, + CREATE_ATTRIBUTES_TOO_LOW, + CREATE_ATTRIBUTES_EQUAL_TO_ZERO, CREATE_EXISTS_NAME, CREATE_TOO_MUCH_CHARACTERS }; @@ -263,18 +312,26 @@ enum AttribmodResponseCode { ATTRIBMOD_NO_POINTS_LEFT, ATTRIBMOD_DENIED }; + // Object type enumeration -enum { - // A simple item +enum ThingType +{ + // A simple item. OBJECT_ITEM = 0, - // An item that can be activated (doors, switchs, sign, ...) + // An item that toggle map/quest actions (doors, switchs, ...) + // and can speak (map panels). OBJECT_ACTOR, - // Non-Playable-Character is an actor capable of movement and maybe actions + // Non-Playable-Character is an actor capable of movement and maybe actions. OBJECT_NPC, - // A monster (moving actor with AI. able to toggle map/quest actions, too) + // A monster (moving actor with AI. Should be able to toggle map/quest + // actions, too). OBJECT_MONSTER, - // A player - OBJECT_PLAYER + // A normal being. + OBJECT_CHARACTER, + // A effect to be shown. + OBJECT_EFFECT, + // Server-only object. + OBJECT_OTHER }; // Moving object flags diff --git a/src/net/manaserv/stats.cpp b/src/net/manaserv/stats.cpp new file mode 100644 index 00000000..b79b1fd9 --- /dev/null +++ b/src/net/manaserv/stats.cpp @@ -0,0 +1,202 @@ +/* + * The Mana Client + * Copyright (C) 2010 The Mana Developers + * + * This file is part of The Mana Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "net/manaserv/stats.h" + +#include "log.h" + +#include "gui/statuswindow.h" + +#include "resources/itemdb.h" + +#include "utils/gettext.h" +#include "utils/xml.h" + +#include <list> +#include <map> + +namespace ManaServ { +namespace Stats { + typedef struct { + unsigned int id; + std::string name; + std::string tag; + std::string effect; + std::string description; + bool modifiable; + } Stat; + + typedef std::map<unsigned int, Stat> StatMap; + StatMap stats; + + static void loadBuiltins() + { + { + Stat s; + s.id = 16; + s.name = _("Strength"); + s.tag = "str"; + s.effect = _("Strength %+d"); + s.description = ""; + s.modifiable = true; + + stats[s.id] = s; + } + + { + Stat s; + s.id = 17; + s.name = _("Agility"); + s.tag = "agi"; + s.effect = _("Agility %+d"); + s.description = ""; + s.modifiable = true; + + stats[s.id] = s; + } + + { + Stat s; + s.id = 18; + s.name = _("Dexterity"); + s.tag = "dex"; + s.effect = _("Dexterity %+d"); + s.description = ""; + s.modifiable = true; + + stats[s.id] = s; + } + + { + Stat s; + s.id = 19; + s.name = _("Vitality"); + s.tag = "vit"; + s.effect = _("Vitality %+d"); + s.description = ""; + s.modifiable = true; + + stats[s.id] = s; + } + + { + Stat s; + s.id = 20; + s.name = _("Intelligence"); + s.tag = "int"; + s.effect = _("Intelligence %+d"); + s.description = ""; + s.modifiable = true; + + stats[s.id] = s; + } + + { + Stat s; + s.id = 21; + s.name = _("Willpower"); + s.tag = "will"; + s.effect = _("Willpower %+d"); + s.description = ""; + s.modifiable = true; + + stats[s.id] = s; + } + } + + void load() + { + XML::Document doc("stats.xml"); + xmlNodePtr rootNode = doc.rootNode(); + + if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "stats")) + { + logger->log("Stats: Error while loading stats.xml!"); + loadBuiltins(); + return; + } + + for_each_xml_child_node(node, rootNode) + { + if (!xmlStrEqual(node->name, BAD_CAST "stat")) + continue; + + int id = XML::getProperty(node, "id", 0); + + if (id == 0) + { + logger->log("Stats: Invalid or missing stat ID in stats.xml!"); + continue; + } + else if (stats.find(id) != stats.end()) + { + logger->log("Stats: Redefinition of stat ID %d", id); + } + + std::string name = XML::getProperty(node, "name", ""); + + if (name.empty()) + { + logger->log("Stats: Invalid or missing stat name in " + "stats.xml!"); + continue; + } + + Stat s; + s.id = id; + s.name = name; + s.tag = XML::getProperty(node, "tag", ""); + s.effect = XML::getProperty(node, "effect", ""); + s.description = XML::getProperty(node, "desc", ""); + s.modifiable = XML::getProperty(node, "modifiable", "false") + == "true"; + + stats[id] = s; + } + } + + void unload() + { + stats.clear(); + } + + void informItemDB() + { + std::list<ItemDB::Stat> dbStats; + + StatMap::const_iterator it, it_end; + for (it = stats.begin(), it_end = stats.end(); it != it_end; it++) + if (!it->second.tag.empty()) + dbStats.push_back(ItemDB::Stat(it->second.tag, + it->second.effect)); + + ItemDB::setStatsList(dbStats); + } + + void informStatusWindow() + { + StatMap::const_iterator it, it_end; + for (it = stats.begin(), it_end = stats.end(); it != it_end; it++) + statusWindow->addAttribute(it->second.id, it->second.name, + it->second.modifiable, + it->second.description); + } +} // namespace Stats +} // namespace ManaServ diff --git a/src/net/manaserv/stats.h b/src/net/manaserv/stats.h new file mode 100644 index 00000000..c4afbd79 --- /dev/null +++ b/src/net/manaserv/stats.h @@ -0,0 +1,36 @@ +/* + * The Mana Client + * Copyright (C) 2010 The Mana Developers + * + * This file is part of The Mana Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef NET_MANASERV_STATS_H +#define NET_MANASERV_STATS_H + +namespace ManaServ { +namespace Stats { + void load(); + + void unload(); + + void informItemDB(); + + void informStatusWindow(); +} // namespace Stats +} // namespace ManaServ + +#endif // NET_MANASERV_STATS_H diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index a975abe8..14f48055 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -98,12 +98,12 @@ GeneralHandler::GeneralHandler(): generalHandler = this; std::list<ItemDB::Stat> stats; - stats.push_back(ItemDB::Stat("str", N_("Strength %+d"))); - stats.push_back(ItemDB::Stat("agi", N_("Agility %+d"))); - stats.push_back(ItemDB::Stat("vit", N_("Vitality %+d"))); - stats.push_back(ItemDB::Stat("int", N_("Intelligence %+d"))); - stats.push_back(ItemDB::Stat("dex", N_("Dexterity %+d"))); - stats.push_back(ItemDB::Stat("luck", N_("Luck %+d"))); + stats.push_back(ItemDB::Stat("str", _("Strength %+d"))); + stats.push_back(ItemDB::Stat("agi", _("Agility %+d"))); + stats.push_back(ItemDB::Stat("vit", _("Vitality %+d"))); + stats.push_back(ItemDB::Stat("int", _("Intelligence %+d"))); + stats.push_back(ItemDB::Stat("dex", _("Dexterity %+d"))); + stats.push_back(ItemDB::Stat("luck", _("Luck %+d"))); ItemDB::setStatsList(stats); } @@ -214,20 +214,20 @@ void GeneralHandler::guiWindowsLoaded() inventoryWindow->setSplitAllowed(false); skillDialog->loadSkills("ea-skills.xml"); - statusWindow->addAttribute(STR, _("Strength"), true); - statusWindow->addAttribute(AGI, _("Agility"), true); - statusWindow->addAttribute(VIT, _("Vitality"), true); - statusWindow->addAttribute(INT, _("Intelligence"), true); - statusWindow->addAttribute(DEX, _("Dexterity"), true); - statusWindow->addAttribute(LUK, _("Luck"), true); - - statusWindow->addAttribute(ATK, _("Attack"), false); - statusWindow->addAttribute(DEF, _("Defense"), false); - statusWindow->addAttribute(MATK, _("M.Attack"), false); - statusWindow->addAttribute(MDEF, _("M.Defense"), false); - statusWindow->addAttribute(HIT, _("% Accuracy"), false); - statusWindow->addAttribute(FLEE, _("% Evade"), false); - statusWindow->addAttribute(CRIT, _("% Critical"), false); + statusWindow->addAttribute(STR, _("Strength"), true, ""); + statusWindow->addAttribute(AGI, _("Agility"), true, ""); + statusWindow->addAttribute(VIT, _("Vitality"), true, ""); + statusWindow->addAttribute(INT, _("Intelligence"), true, ""); + statusWindow->addAttribute(DEX, _("Dexterity"), true, ""); + statusWindow->addAttribute(LUK, _("Luck"), true, ""); + + statusWindow->addAttribute(ATK, _("Attack"), false, ""); + statusWindow->addAttribute(DEF, _("Defense"), false, ""); + statusWindow->addAttribute(MATK, _("M.Attack"), false, ""); + statusWindow->addAttribute(MDEF, _("M.Defense"), false, ""); + statusWindow->addAttribute(HIT, _("% Accuracy"), false, ""); + statusWindow->addAttribute(FLEE, _("% Evade"), false, ""); + statusWindow->addAttribute(CRIT, _("% Critical"), false, ""); } void GeneralHandler::guiWindowsUnloaded() diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 9d7e72ea..b54a0ba7 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -222,4 +222,9 @@ void NpcHandler::endShopping(int beingId) // TODO } +void NpcHandler::clearDialogs() +{ + mNpcDialogs.clear(); +} + } // namespace TmwAthena diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index a40371a6..bd696bdd 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -67,6 +67,8 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler void endShopping(int beingId); + void clearDialogs(); + private: typedef struct { NpcDialog* dialog; diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 62cdc168..84fcdeee 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -41,6 +41,7 @@ #include "net/messageout.h" #include "net/tmwa/protocol.h" +#include "net/tmwa/npchandler.h" #include "utils/stringutils.h" #include "utils/gettext.h" @@ -85,6 +86,10 @@ namespace { SellDialog::closeAll(); viewport->closePopupMenu(); + + TmwAthena::NpcHandler *handler = + static_cast<TmwAthena::NpcHandler*>(Net::getNpcHandler()); + handler->clearDialogs(); } } deathListener; |