From 4c6378b94a264dfa540b27b96d45fe2fcb3fbcd4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 31 Jul 2011 16:08:01 +0300 Subject: Extract shared logic from specialhandler netcode to ea namespace. --- src/net/tmwa/specialhandler.cpp | 200 +--------------------------------------- 1 file changed, 4 insertions(+), 196 deletions(-) (limited to 'src/net/tmwa/specialhandler.cpp') diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp index a2a2f3fb2..b175368bd 100644 --- a/src/net/tmwa/specialhandler.cpp +++ b/src/net/tmwa/specialhandler.cpp @@ -23,54 +23,13 @@ #include "net/tmwa/specialhandler.h" #include "log.h" -#include "localplayer.h" -#include "playerinfo.h" - -#include "gui/skilldialog.h" - -#include "gui/widgets/chattab.h" #include "net/messagein.h" -#include "net/messageout.h" #include "net/tmwa/protocol.h" -#include "utils/gettext.h" - #include "debug.h" -/** job dependend identifiers (?) */ -#define SKILL_BASIC 0x0001 -#define SKILL_WARP 0x001b -#define SKILL_STEAL 0x0032 -#define SKILL_ENVENOM 0x0034 - -/** basic skills identifiers */ -#define BSKILL_TRADE 0x0000 -#define BSKILL_EMOTE 0x0001 -#define BSKILL_SIT 0x0002 -#define BSKILL_CREATECHAT 0x0003 -#define BSKILL_JOINPARTY 0x0004 -#define BSKILL_SHOUT 0x0005 -#define BSKILL_PK 0x0006 // ?? -#define BSKILL_SETALLIGN 0x0007 // ?? - -/** reasons why action failed */ -#define RFAIL_SKILLDEP 0x00 -#define RFAIL_INSUFSP 0x01 -#define RFAIL_INSUFHP 0x02 -#define RFAIL_NOMEMO 0x03 -#define RFAIL_SKILLDELAY 0x04 -#define RFAIL_ZENY 0x05 -#define RFAIL_WEAPON 0x06 -#define RFAIL_REDGEM 0x07 -#define RFAIL_BLUEGEM 0x08 -#define RFAIL_OVERWEIGHT 0x09 -#define RFAIL_GENERIC 0x0a - -/** should always be zero if failed */ -#define SKILL_FAILED 0x00 - extern Net::SpecialHandler *specialHandler; namespace TmwAthena @@ -91,177 +50,26 @@ SpecialHandler::SpecialHandler() void SpecialHandler::handleMessage(Net::MessageIn &msg) { - int skillCount; - int skillId; - switch (msg.getId()) { case SMSG_PLAYER_SKILLS: { - msg.readInt16(); // length - skillCount = (msg.getLength() - 4) / 37; - - for (int k = 0; k < skillCount; k++) - { - skillId = msg.readInt16(); - msg.readInt16(); // target type - msg.skip(2); // unused - int level = msg.readInt16(); - msg.readInt16(); // sp - msg.readInt16(); // range - msg.skip(24); // unused - int up = msg.readInt8(); - - PlayerInfo::setStatBase(skillId, level); - if (skillDialog) - { - if (!skillDialog->setModifiable(skillId, up)) - skillDialog->addSkill(skillId, level, up); - } - } + processPlayerSkills(msg); break; } case SMSG_PLAYER_SKILL_UP: - { - skillId = msg.readInt16(); - int level = msg.readInt16(); - msg.readInt16(); // sp - msg.readInt16(); // range - int up = msg.readInt8(); - - PlayerInfo::setStatBase(skillId, level); - if (skillDialog) - { - if (!skillDialog->setModifiable(skillId, up)) - skillDialog->addSkill(skillId, level, up); - } - } + processPlayerSkillUp(msg); break; case SMSG_SKILL_FAILED: - { - // Action failed (ex. sit because you have not reached the - // right level) - skillId = msg.readInt16(); - short bskill = msg.readInt16(); - msg.readInt16(); // btype - char success = msg.readInt8(); - char reason = msg.readInt8(); - if (success != SKILL_FAILED && bskill == BSKILL_EMOTE) - logger->log("Action: %d/%d", bskill, success); - - std::string msg; - if (success == SKILL_FAILED && skillId == SKILL_BASIC) - { - if (player_node && bskill == BSKILL_EMOTE - && reason == RFAIL_SKILLDEP) - { - player_node->stopAdvert(); - } - - switch (bskill) - { - case BSKILL_TRADE: - msg = _("Trade failed!"); - break; - case BSKILL_EMOTE: - msg = _("Emote failed!"); - break; - case BSKILL_SIT: - msg = _("Sit failed!"); - break; - case BSKILL_CREATECHAT: - msg = _("Chat creating failed!"); - break; - case BSKILL_JOINPARTY: - msg = _("Could not join party!"); - break; - case BSKILL_SHOUT: - msg = _("Cannot shout!"); - break; - default: - logger->log("QQQ SMSG_SKILL_FAILED: bskill " - + toString(bskill)); - break; - } - - msg += " "; - - switch (reason) - { - case RFAIL_SKILLDEP: - msg += _("You have not yet reached a high enough " - "lvl!"); - break; - case RFAIL_INSUFHP: - msg += _("Insufficient HP!"); - break; - case RFAIL_INSUFSP: - msg += _("Insufficient SP!"); - break; - case RFAIL_NOMEMO: - msg += _("You have no memos!"); - break; - case RFAIL_SKILLDELAY: - msg += _("You cannot do that right now!"); - break; - case RFAIL_ZENY: - msg += _("Seems you need more money... ;-)"); - break; - case RFAIL_WEAPON: - msg += _("You cannot use this skill with that " - "kind of weapon!"); - break; - case RFAIL_REDGEM: - msg += _("You need another red gem!"); - break; - case RFAIL_BLUEGEM: - msg += _("You need another blue gem!"); - break; - case RFAIL_OVERWEIGHT: - msg += _("You're carrying to much to do this!"); - break; - default: - msg += _("Huh? What's that?"); - logger->log("QQQ SMSG_SKILL_FAILED: reason " - + toString(reason)); - break; - } - } - else - { - switch (skillId) - { - case SKILL_WARP : - msg = _("Warp failed..."); - break; - case SKILL_STEAL : - msg = _("Could not steal anything..."); - break; - case SKILL_ENVENOM : - msg = _("Poison had no effect..."); - break; - default: - logger->log("QQQ SMSG_SKILL_FAILED: skillId " - + toString(skillId)); - break; - } - } - - if (localChatTab) - localChatTab->chatLog(msg); - } + processSkillFailed(msg); break; + default: break; } } -void SpecialHandler::use(int id A_UNUSED) -{ - // TODO -} - void SpecialHandler::use(int id, int level, int beingId) { MessageOut outMsg(CMSG_SKILL_USE_BEING); -- cgit v1.2.3-60-g2f50