From 42a9e7b1eeced8503f909b0276ee251a2bfe75c6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 30 Aug 2015 17:08:12 +0300 Subject: Move receive code from skillhandler into separate file. --- src/CMakeLists.txt | 6 + src/Makefile.am | 6 + src/net/ea/skillhandler.cpp | 23 --- src/net/ea/skillhandler.h | 37 ---- src/net/ea/skillrecv.cpp | 59 +++++++ src/net/ea/skillrecv.h | 72 ++++++++ src/net/eathena/skillhandler.cpp | 353 +++---------------------------------- src/net/eathena/skillhandler.h | 35 ---- src/net/eathena/skillrecv.cpp | 365 +++++++++++++++++++++++++++++++++++++++ src/net/eathena/skillrecv.h | 54 ++++++ src/net/tmwa/skillhandler.cpp | 180 +------------------ src/net/tmwa/skillhandler.h | 5 - src/net/tmwa/skillrecv.cpp | 218 +++++++++++++++++++++++ src/net/tmwa/skillrecv.h | 39 +++++ 14 files changed, 846 insertions(+), 606 deletions(-) create mode 100644 src/net/ea/skillrecv.cpp create mode 100644 src/net/ea/skillrecv.h create mode 100644 src/net/eathena/skillrecv.cpp create mode 100644 src/net/eathena/skillrecv.h create mode 100644 src/net/tmwa/skillrecv.cpp create mode 100644 src/net/tmwa/skillrecv.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 96917c595..5f1e45331 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1397,6 +1397,8 @@ SET(SRCS_EVOL net/ea/playerrecv.h net/ea/skillhandler.cpp net/ea/skillhandler.h + net/ea/skillrecv.cpp + net/ea/skillrecv.h net/ea/token.h net/ea/tradehandler.cpp net/ea/tradehandler.h @@ -1481,6 +1483,8 @@ SET(SRCS_TMWA net/tmwa/serverfeatures.h net/tmwa/skillhandler.cpp net/tmwa/skillhandler.h + net/tmwa/skillrecv.cpp + net/tmwa/skillrecv.h net/tmwa/sprite.h net/tmwa/tradehandler.cpp net/tmwa/tradehandler.h @@ -1708,6 +1712,8 @@ SET(SRCS_EATHENA net/eathena/serverfeatures.h net/eathena/skillhandler.cpp net/eathena/skillhandler.h + net/eathena/skillrecv.cpp + net/eathena/skillrecv.h net/eathena/sprite.h net/eathena/tradehandler.cpp net/eathena/tradehandler.h diff --git a/src/Makefile.am b/src/Makefile.am index 6e00350a0..26a9960a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1239,6 +1239,8 @@ manaplus_SOURCES += main.cpp \ net/ea/playerrecv.h \ net/ea/skillhandler.cpp \ net/ea/skillhandler.h \ + net/ea/skillrecv.cpp \ + net/ea/skillrecv.h \ net/ea/token.h \ net/ea/tradehandler.cpp \ net/ea/tradehandler.h @@ -1324,6 +1326,8 @@ manaplus_SOURCES += \ net/tmwa/serverfeatures.h \ net/tmwa/skillhandler.cpp \ net/tmwa/skillhandler.h \ + net/tmwa/skillrecv.cpp \ + net/tmwa/skillrecv.h \ net/tmwa/sprite.h \ net/tmwa/tradehandler.cpp \ net/tmwa/tradehandler.h @@ -1554,6 +1558,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/eathena/serverfeatures.h \ net/eathena/skillhandler.cpp \ net/eathena/skillhandler.h \ + net/eathena/skillrecv.cpp \ + net/eathena/skillrecv.h \ net/eathena/sprite.h \ net/eathena/tradehandler.cpp \ net/eathena/tradehandler.h \ diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp index f05d1f18a..c5ce14cdf 100644 --- a/src/net/ea/skillhandler.cpp +++ b/src/net/ea/skillhandler.cpp @@ -37,27 +37,4 @@ SkillHandler::SkillHandler() { } -void SkillHandler::processPlayerSkillUp(Net::MessageIn &msg) -{ - const int skillId = msg.readInt16("skill id"); - const int level = msg.readInt16("skill level"); - const int sp = msg.readInt16("sp"); - const int range = msg.readInt16("range"); - const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); - - if (skillDialog && PlayerInfo::getSkillLevel(skillId) != level) - skillDialog->playUpdateEffect(skillId); - PlayerInfo::setSkillLevel(skillId, level); - if (skillDialog) - { - if (!skillDialog->updateSkill(skillId, range, - up, SkillType::Unknown, sp)) - { - skillDialog->addSkill(SkillOwner::Player, - skillId, "", level, - range, up, SkillType::Unknown, sp); - } - } -} - } // namespace Ea diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h index cbb7f35cd..298036087 100644 --- a/src/net/ea/skillhandler.h +++ b/src/net/ea/skillhandler.h @@ -27,40 +27,6 @@ #include "localconsts.h" -namespace Net -{ - class MessageIn; -} - -/** job dependend identifiers (?) */ -static const unsigned int SKILL_BASIC = 0x0001; -static const unsigned int SKILL_WARP = 0x001b; -static const unsigned int SKILL_STEAL = 0x0032; -static const unsigned int SKILL_ENVENOM = 0x0034; - -/** basic skills identifiers */ -static const unsigned int BSKILL_TRADE = 0x0000; -static const unsigned int BSKILL_EMOTE = 0x0001; -static const unsigned int BSKILL_SIT = 0x0002; -static const unsigned int BSKILL_CREATECHAT = 0x0003; -static const unsigned int BSKILL_JOINPARTY = 0x0004; -static const unsigned int BSKILL_SHOUT = 0x0005; - -/** reasons why action failed */ -static const unsigned int RFAIL_SKILLDEP = 0x00; -static const unsigned int RFAIL_INSUFSP = 0x01; -static const unsigned int RFAIL_INSUFHP = 0x02; -static const unsigned int RFAIL_NOMEMO = 0x03; -static const unsigned int RFAIL_SKILLDELAY = 0x04; -static const unsigned int RFAIL_ZENY = 0x05; -static const unsigned int RFAIL_WEAPON = 0x06; -static const unsigned int RFAIL_REDGEM = 0x07; -static const unsigned int RFAIL_BLUEGEM = 0x08; -static const unsigned int RFAIL_OVERWEIGHT = 0x09; - -/** should always be zero if failed */ -static const unsigned int SKILL_FAILED = 0x00; - namespace Ea { @@ -70,9 +36,6 @@ class SkillHandler notfinal : public Net::SkillHandler SkillHandler(); A_DELETE_COPY(SkillHandler) - - protected: - static void processPlayerSkillUp(Net::MessageIn &msg); }; } // namespace Ea diff --git a/src/net/ea/skillrecv.cpp b/src/net/ea/skillrecv.cpp new file mode 100644 index 000000000..18e3e63e7 --- /dev/null +++ b/src/net/ea/skillrecv.cpp @@ -0,0 +1,59 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus 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 . + */ + +#include "net/ea/skillrecv.h" + +#include "being/playerinfo.h" + +#include "gui/windows/skilldialog.h" + +#include "net/messagein.h" + +#include "debug.h" + +namespace Ea +{ + +void SkillRecv::processPlayerSkillUp(Net::MessageIn &msg) +{ + const int skillId = msg.readInt16("skill id"); + const int level = msg.readInt16("skill level"); + const int sp = msg.readInt16("sp"); + const int range = msg.readInt16("range"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); + + if (skillDialog && PlayerInfo::getSkillLevel(skillId) != level) + skillDialog->playUpdateEffect(skillId); + PlayerInfo::setSkillLevel(skillId, level); + if (skillDialog) + { + if (!skillDialog->updateSkill(skillId, range, + up, SkillType::Unknown, sp)) + { + skillDialog->addSkill(SkillOwner::Player, + skillId, "", level, + range, up, SkillType::Unknown, sp); + } + } +} + +} // namespace Ea diff --git a/src/net/ea/skillrecv.h b/src/net/ea/skillrecv.h new file mode 100644 index 000000000..a980d9739 --- /dev/null +++ b/src/net/ea/skillrecv.h @@ -0,0 +1,72 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus 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 . + */ + +#ifndef NET_EA_SKILLRECV_H +#define NET_EA_SKILLRECV_H + +#include "net/skillhandler.h" + +#include "localconsts.h" + +namespace Net +{ + class MessageIn; +} + +/** job dependend identifiers (?) */ +static const unsigned int SKILL_BASIC = 0x0001; +static const unsigned int SKILL_WARP = 0x001b; +static const unsigned int SKILL_STEAL = 0x0032; +static const unsigned int SKILL_ENVENOM = 0x0034; + +/** basic skills identifiers */ +static const unsigned int BSKILL_TRADE = 0x0000; +static const unsigned int BSKILL_EMOTE = 0x0001; +static const unsigned int BSKILL_SIT = 0x0002; +static const unsigned int BSKILL_CREATECHAT = 0x0003; +static const unsigned int BSKILL_JOINPARTY = 0x0004; +static const unsigned int BSKILL_SHOUT = 0x0005; + +/** reasons why action failed */ +static const unsigned int RFAIL_SKILLDEP = 0x00; +static const unsigned int RFAIL_INSUFSP = 0x01; +static const unsigned int RFAIL_INSUFHP = 0x02; +static const unsigned int RFAIL_NOMEMO = 0x03; +static const unsigned int RFAIL_SKILLDELAY = 0x04; +static const unsigned int RFAIL_ZENY = 0x05; +static const unsigned int RFAIL_WEAPON = 0x06; +static const unsigned int RFAIL_REDGEM = 0x07; +static const unsigned int RFAIL_BLUEGEM = 0x08; +static const unsigned int RFAIL_OVERWEIGHT = 0x09; + +/** should always be zero if failed */ +static const unsigned int SKILL_FAILED = 0x00; + +namespace Ea +{ + namespace SkillRecv + { + void processPlayerSkillUp(Net::MessageIn &msg); + } // namespace SkillRecv +} // namespace Ea + +#endif // NET_EA_SKILLRECV_H diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index 8c941e88f..0302f36aa 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -33,9 +33,12 @@ #include "gui/windows/skilldialog.h" +#include "net/ea/skillrecv.h" + #include "net/eathena/menu.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" +#include "net/eathena/skillrecv.h" #include "utils/gettext.h" #include "utils/stringutils.h" @@ -82,75 +85,75 @@ void SkillHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_PLAYER_SKILLS: - processPlayerSkills(msg); + SkillRecv::processPlayerSkills(msg); break; case SMSG_PLAYER_SKILL_UP: - processPlayerSkillUp(msg); + Ea::SkillRecv::processPlayerSkillUp(msg); break; case SMSG_SKILL_FAILED: - processSkillFailed(msg); + SkillRecv::processSkillFailed(msg); break; case SMSG_PLAYER_SKILL_COOLDOWN: - processSkillCoolDown(msg); + SkillRecv::processSkillCoolDown(msg); break; case SMSG_PLAYER_SKILL_COOLDOWN_LIST: - processSkillCoolDownList(msg); + SkillRecv::processSkillCoolDownList(msg); break; case SMSG_SKILL_SNAP: - processSkillSnap(msg); + SkillRecv::processSkillSnap(msg); break; case SMSG_PLAYER_ADD_SKILL: - processSkillAdd(msg); + SkillRecv::processSkillAdd(msg); break; case SMSG_PLAYER_UPDATE_SKILL: - processSkillUpdate(msg); + SkillRecv::processSkillUpdate(msg); break; case SMSG_PLAYER_DELETE_SKILL: - processSkillDelete(msg); + SkillRecv::processSkillDelete(msg); break; case SMSG_SKILL_WARP_POINT: - processSkillWarpPoint(msg); + SkillRecv::processSkillWarpPoint(msg); break; case SMSG_SKILL_MEMO_MESSAGE: - processSkillMemoMessage(msg); + SkillRecv::processSkillMemoMessage(msg); break; case SMSG_PLAYER_SKILL_PRODUCE_MIX_LIST: - processSkillProduceMixList(msg); + SkillRecv::processSkillProduceMixList(msg); break; case SMSG_PLAYER_SKILL_PRODUCE_EFFECT: - processSkillProduceEffect(msg); + SkillRecv::processSkillProduceEffect(msg); break; case SMSG_SKILL_UNIT_UPDATE: - processSkillUnitUpdate(msg); + SkillRecv::processSkillUnitUpdate(msg); break; case SMSG_SKILL_ARROW_CREATE_LIST: - processSkillArrowCreateList(msg); + SkillRecv::processSkillArrowCreateList(msg); break; case SMSG_PLAYER_SKILL_AUTO_SPELLS: - processSkillAutoSpells(msg); + SkillRecv::processSkillAutoSpells(msg); break; case SMSG_SKILL_DEVOTION_EFFECT: - processSkillDevotionEffect(msg); + SkillRecv::processSkillDevotionEffect(msg); break; case SMSG_SKILL_ITEM_LIST_WINDOW: - processSkillItemListWindow(msg); + SkillRecv::processSkillItemListWindow(msg); break; default: @@ -196,318 +199,4 @@ void SkillHandler::useMap(const int id, const std::string &map) const outMsg.writeString(map, 16, "map name"); } -void SkillHandler::processPlayerSkills(Net::MessageIn &msg) -{ - msg.readInt16("len"); - const int skillCount = (msg.getLength() - 4) / 37; - int updateSkill = 0; - - if (skillDialog) - skillDialog->hideSkills(SkillOwner::Player); - for (int k = 0; k < skillCount; k++) - { - const int skillId = msg.readInt16("skill id"); - const SkillType::SkillType inf = static_cast( - msg.readInt32("inf")); - const int level = msg.readInt16("skill level"); - const int sp = msg.readInt16("sp"); - const int range = msg.readInt16("range"); - const std::string name = msg.readString(24, "skill name"); - const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); - const int oldLevel = PlayerInfo::getSkillLevel(skillId); - if (oldLevel && oldLevel != level) - updateSkill = skillId; - PlayerInfo::setSkillLevel(skillId, level); - if (skillDialog) - { - if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) - { - skillDialog->addSkill(SkillOwner::Player, - skillId, name, level, range, up, inf, sp); - } - } - } - if (skillDialog) - { - skillDialog->update(); - if (updateSkill) - skillDialog->playUpdateEffect(updateSkill); - } -} - -void SkillHandler::processSkillAdd(Net::MessageIn &msg) -{ - int updateSkill = 0; - const int skillId = msg.readInt16("skill id"); - const SkillType::SkillType inf = static_cast( - msg.readInt32("inf")); - const int level = msg.readInt16("skill level"); - const int sp = msg.readInt16("sp"); - const int range = msg.readInt16("range"); - const std::string name = msg.readString(24, "skill name"); - const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); - const int oldLevel = PlayerInfo::getSkillLevel(skillId); - if (oldLevel && oldLevel != level) - updateSkill = skillId; - PlayerInfo::setSkillLevel(skillId, level); - if (skillDialog) - { - if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) - { - skillDialog->addSkill(SkillOwner::Player, - skillId, name, level, range, up, inf, sp); - } - skillDialog->update(); - if (updateSkill) - skillDialog->playUpdateEffect(updateSkill); - } -} - -void SkillHandler::processSkillUpdate(Net::MessageIn &msg) -{ - int updateSkill = 0; - const int skillId = msg.readInt16("skill id"); - const SkillType::SkillType inf = static_cast( - msg.readInt32("inf")); - const int level = msg.readInt16("skill level"); - const int sp = msg.readInt16("sp"); - const int range = msg.readInt16("range"); - const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); - const int oldLevel = PlayerInfo::getSkillLevel(skillId); - if (oldLevel && oldLevel != level) - updateSkill = skillId; - PlayerInfo::setSkillLevel(skillId, level); - if (skillDialog) - { - if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) - { - skillDialog->addSkill(SkillOwner::Player, - skillId, "", level, range, up, inf, sp); - } - skillDialog->update(); - if (updateSkill) - skillDialog->playUpdateEffect(updateSkill); - } -} - -void SkillHandler::processSkillDelete(Net::MessageIn &msg) -{ - int updateSkill = 0; - const int skillId = msg.readInt16("skill id"); - const int oldLevel = PlayerInfo::getSkillLevel(skillId); - if (oldLevel != 0) - updateSkill = skillId; - PlayerInfo::setSkillLevel(skillId, 0); - if (skillDialog) - { - skillDialog->removeSkill(skillId); - skillDialog->update(); - if (updateSkill) - skillDialog->playRemoveEffect(updateSkill); - } -} - -void SkillHandler::processSkillCoolDown(Net::MessageIn &msg) -{ - const int skillId = msg.readInt16("skill id"); - const int duration = msg.readInt32("duration"); - if (skillDialog) - skillDialog->setSkillDuration(SkillOwner::Player, skillId, duration); -} - -void SkillHandler::processSkillCoolDownList(Net::MessageIn &msg) -{ - const int count = (msg.readInt16("len") - 4) / 10; - for (int f = 0; f < count; f ++) - { - const int skillId = msg.readInt16("skill id"); - msg.readInt32("total"); - const int duration = msg.readInt32("duration"); - if (skillDialog) - { - skillDialog->setSkillDuration(SkillOwner::Player, - skillId, duration); - } - } -} - -void SkillHandler::processSkillFailed(Net::MessageIn &msg) -{ - // Action failed (ex. sit because you have not reached the - // right level) - const int skillId = msg.readInt16("skill id"); - const int bskill = msg.readInt32("btype"); - const signed char success = msg.readUInt8("success"); - const signed char reason = msg.readUInt8("reason"); - if (success != static_cast(SKILL_FAILED) - && bskill == static_cast(BSKILL_EMOTE)) - { - logger->log("Action: %d/%d", bskill, success); - } - - std::string txt; - if (success == static_cast(SKILL_FAILED) && bskill != 0) - { - if (localPlayer && bskill == static_cast(BSKILL_EMOTE) - && reason == static_cast(RFAIL_SKILLDEP)) - { - localPlayer->stopAdvert(); - } - - SkillInfo *const info = skillDialog->getSkill(bskill); - if (info) - txt = info->errorText; - else - txt = strprintf(_("Unknown skill error: %d"), bskill); - } - else - { - SkillInfo *const info = skillDialog->getSkill(skillId); - if (info) - txt = info->errorText + "."; - else - txt = strprintf(_("Unknown skill error: %d."), skillId); - } - - txt.append(" "); - switch (reason) - { - case RFAIL_SKILLDEP: - // TRANSLATORS: error message - txt.append(_("You have not yet reached a high enough lvl!")); - break; - case RFAIL_INSUFHP: - // TRANSLATORS: error message - txt.append(_("Insufficient HP!")); - break; - case RFAIL_INSUFSP: - // TRANSLATORS: error message - txt.append(_("Insufficient SP!")); - break; - case RFAIL_NOMEMO: - // TRANSLATORS: error message - txt.append(_("You have no memos!")); - break; - case RFAIL_SKILLDELAY: - // TRANSLATORS: error message - txt.append(_("You cannot do that right now!")); - break; - case RFAIL_ZENY: - // TRANSLATORS: error message - txt.append(_("Seems you need more money... ;-)")); - break; - case RFAIL_WEAPON: - // TRANSLATORS: error message - txt.append(_("You cannot use this skill with that " - "kind of weapon!")); - break; - case RFAIL_REDGEM: - // TRANSLATORS: error message - txt.append(_("You need another red gem!")); - break; - case RFAIL_BLUEGEM: - // TRANSLATORS: error message - txt.append(_("You need another blue gem!")); - break; - case RFAIL_OVERWEIGHT: - // TRANSLATORS: error message - txt.append(_("You're carrying to much to do this!")); - break; - default: - UNIMPLIMENTEDPACKET; - break; - } - - NotifyManager::notify(NotifyTypes::SKILL_FAIL_MESSAGE, txt); -} - -void SkillHandler::processSkillSnap(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readBeingId("being id"); - msg.readInt16("x"); - msg.readInt16("y"); -} - -void SkillHandler::processSkillWarpPoint(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readInt16("skill id"); - msg.readString(16, "map name 1"); - msg.readString(16, "map name 2"); - msg.readString(16, "map name 3"); - msg.readString(16, "map name 4"); -} - -void SkillHandler::processSkillMemoMessage(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readUInt8("type"); -} - -void SkillHandler::processSkillProduceMixList(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - - const int count = (msg.readInt16("len") - 8) / 8; - for (int f = 0; f < count; f ++) - { - msg.readInt16("item id"); - for (int d = 0; d < 3; d ++) - msg.readInt16("material id"); - } -} - -void SkillHandler::processSkillProduceEffect(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - - msg.readInt16("flag"); - msg.readInt16("item id"); -} - -void SkillHandler::processSkillUnitUpdate(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - - msg.readBeingId("being id"); -} - -void SkillHandler::processSkillArrowCreateList(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - - const int count = (msg.readInt16("len") - 4) / 2; - for (int f = 0; f < count; f ++) - msg.readInt16("item id"); -} - -void SkillHandler::processSkillAutoSpells(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - - for (int f = 0; f < 7; f ++) - msg.readInt32("skill id"); - - menu = MenuType::AutoSpell; -} - -void SkillHandler::processSkillDevotionEffect(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - - msg.readBeingId("being id"); - for (int f = 0; f < 5; f ++) - msg.readInt32("devotee id"); - msg.readInt16("range"); -} - -void SkillHandler::processSkillItemListWindow(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - - msg.readInt32("skill level"); - msg.readInt32("unused"); -} - } // namespace EAthena diff --git a/src/net/eathena/skillhandler.h b/src/net/eathena/skillhandler.h index 2cef21777..6ff52c7ef 100644 --- a/src/net/eathena/skillhandler.h +++ b/src/net/eathena/skillhandler.h @@ -53,41 +53,6 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler const std::string &text) const override final; void useMap(const int id, const std::string &map) const override final; - - protected: - static void processSkillFailed(Net::MessageIn &msg); - - static void processPlayerSkills(Net::MessageIn &msg); - - static void processSkillCoolDown(Net::MessageIn &msg); - - static void processSkillCoolDownList(Net::MessageIn &msg); - - static void processSkillSnap(Net::MessageIn &msg); - - static void processSkillAdd(Net::MessageIn &msg); - - static void processSkillUpdate(Net::MessageIn &msg); - - static void processSkillDelete(Net::MessageIn &msg); - - static void processSkillWarpPoint(Net::MessageIn &msg); - - static void processSkillMemoMessage(Net::MessageIn &msg); - - static void processSkillProduceMixList(Net::MessageIn &msg); - - static void processSkillProduceEffect(Net::MessageIn &msg); - - static void processSkillUnitUpdate(Net::MessageIn &msg); - - static void processSkillArrowCreateList(Net::MessageIn &msg); - - static void processSkillAutoSpells(Net::MessageIn &msg); - - static void processSkillDevotionEffect(Net::MessageIn &msg); - - static void processSkillItemListWindow(Net::MessageIn &msg); }; } // namespace EAthena diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp new file mode 100644 index 000000000..acbabff14 --- /dev/null +++ b/src/net/eathena/skillrecv.cpp @@ -0,0 +1,365 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus 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 . + */ + +#include "net/eathena/skillrecv.h" + +#include "notifymanager.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" + +#include "enums/resources/notifytypes.h" + +#include "gui/widgets/skillinfo.h" + +#include "gui/windows/skilldialog.h" + +#include "net/ea/skillrecv.h" + +#include "net/eathena/menu.h" +#include "net/eathena/messageout.h" +#include "net/eathena/protocol.h" +#include "net/eathena/skillrecv.h" + +#include "utils/gettext.h" +#include "utils/stringutils.h" + +#include "debug.h" + +namespace EAthena +{ + +void SkillRecv::processPlayerSkills(Net::MessageIn &msg) +{ + msg.readInt16("len"); + const int skillCount = (msg.getLength() - 4) / 37; + int updateSkill = 0; + + if (skillDialog) + skillDialog->hideSkills(SkillOwner::Player); + for (int k = 0; k < skillCount; k++) + { + const int skillId = msg.readInt16("skill id"); + const SkillType::SkillType inf = static_cast( + msg.readInt32("inf")); + const int level = msg.readInt16("skill level"); + const int sp = msg.readInt16("sp"); + const int range = msg.readInt16("range"); + const std::string name = msg.readString(24, "skill name"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); + const int oldLevel = PlayerInfo::getSkillLevel(skillId); + if (oldLevel && oldLevel != level) + updateSkill = skillId; + PlayerInfo::setSkillLevel(skillId, level); + if (skillDialog) + { + if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) + { + skillDialog->addSkill(SkillOwner::Player, + skillId, name, level, range, up, inf, sp); + } + } + } + if (skillDialog) + { + skillDialog->update(); + if (updateSkill) + skillDialog->playUpdateEffect(updateSkill); + } +} + +void SkillRecv::processSkillAdd(Net::MessageIn &msg) +{ + int updateSkill = 0; + const int skillId = msg.readInt16("skill id"); + const SkillType::SkillType inf = static_cast( + msg.readInt32("inf")); + const int level = msg.readInt16("skill level"); + const int sp = msg.readInt16("sp"); + const int range = msg.readInt16("range"); + const std::string name = msg.readString(24, "skill name"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); + const int oldLevel = PlayerInfo::getSkillLevel(skillId); + if (oldLevel && oldLevel != level) + updateSkill = skillId; + PlayerInfo::setSkillLevel(skillId, level); + if (skillDialog) + { + if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) + { + skillDialog->addSkill(SkillOwner::Player, + skillId, name, level, range, up, inf, sp); + } + skillDialog->update(); + if (updateSkill) + skillDialog->playUpdateEffect(updateSkill); + } +} + +void SkillRecv::processSkillUpdate(Net::MessageIn &msg) +{ + int updateSkill = 0; + const int skillId = msg.readInt16("skill id"); + const SkillType::SkillType inf = static_cast( + msg.readInt32("inf")); + const int level = msg.readInt16("skill level"); + const int sp = msg.readInt16("sp"); + const int range = msg.readInt16("range"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); + const int oldLevel = PlayerInfo::getSkillLevel(skillId); + if (oldLevel && oldLevel != level) + updateSkill = skillId; + PlayerInfo::setSkillLevel(skillId, level); + if (skillDialog) + { + if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) + { + skillDialog->addSkill(SkillOwner::Player, + skillId, "", level, range, up, inf, sp); + } + skillDialog->update(); + if (updateSkill) + skillDialog->playUpdateEffect(updateSkill); + } +} + +void SkillRecv::processSkillDelete(Net::MessageIn &msg) +{ + int updateSkill = 0; + const int skillId = msg.readInt16("skill id"); + const int oldLevel = PlayerInfo::getSkillLevel(skillId); + if (oldLevel != 0) + updateSkill = skillId; + PlayerInfo::setSkillLevel(skillId, 0); + if (skillDialog) + { + skillDialog->removeSkill(skillId); + skillDialog->update(); + if (updateSkill) + skillDialog->playRemoveEffect(updateSkill); + } +} + +void SkillRecv::processSkillCoolDown(Net::MessageIn &msg) +{ + const int skillId = msg.readInt16("skill id"); + const int duration = msg.readInt32("duration"); + if (skillDialog) + skillDialog->setSkillDuration(SkillOwner::Player, skillId, duration); +} + +void SkillRecv::processSkillCoolDownList(Net::MessageIn &msg) +{ + const int count = (msg.readInt16("len") - 4) / 10; + for (int f = 0; f < count; f ++) + { + const int skillId = msg.readInt16("skill id"); + msg.readInt32("total"); + const int duration = msg.readInt32("duration"); + if (skillDialog) + { + skillDialog->setSkillDuration(SkillOwner::Player, + skillId, duration); + } + } +} + +void SkillRecv::processSkillFailed(Net::MessageIn &msg) +{ + // Action failed (ex. sit because you have not reached the + // right level) + const int skillId = msg.readInt16("skill id"); + const int bskill = msg.readInt32("btype"); + const signed char success = msg.readUInt8("success"); + const signed char reason = msg.readUInt8("reason"); + if (success != static_cast(SKILL_FAILED) + && bskill == static_cast(BSKILL_EMOTE)) + { + logger->log("Action: %d/%d", bskill, success); + } + + std::string txt; + if (success == static_cast(SKILL_FAILED) && bskill != 0) + { + if (localPlayer && bskill == static_cast(BSKILL_EMOTE) + && reason == static_cast(RFAIL_SKILLDEP)) + { + localPlayer->stopAdvert(); + } + + SkillInfo *const info = skillDialog->getSkill(bskill); + if (info) + txt = info->errorText; + else + txt = strprintf(_("Unknown skill error: %d"), bskill); + } + else + { + SkillInfo *const info = skillDialog->getSkill(skillId); + if (info) + txt = info->errorText + "."; + else + txt = strprintf(_("Unknown skill error: %d."), skillId); + } + + txt.append(" "); + switch (reason) + { + case RFAIL_SKILLDEP: + // TRANSLATORS: error message + txt.append(_("You have not yet reached a high enough lvl!")); + break; + case RFAIL_INSUFHP: + // TRANSLATORS: error message + txt.append(_("Insufficient HP!")); + break; + case RFAIL_INSUFSP: + // TRANSLATORS: error message + txt.append(_("Insufficient SP!")); + break; + case RFAIL_NOMEMO: + // TRANSLATORS: error message + txt.append(_("You have no memos!")); + break; + case RFAIL_SKILLDELAY: + // TRANSLATORS: error message + txt.append(_("You cannot do that right now!")); + break; + case RFAIL_ZENY: + // TRANSLATORS: error message + txt.append(_("Seems you need more money... ;-)")); + break; + case RFAIL_WEAPON: + // TRANSLATORS: error message + txt.append(_("You cannot use this skill with that " + "kind of weapon!")); + break; + case RFAIL_REDGEM: + // TRANSLATORS: error message + txt.append(_("You need another red gem!")); + break; + case RFAIL_BLUEGEM: + // TRANSLATORS: error message + txt.append(_("You need another blue gem!")); + break; + case RFAIL_OVERWEIGHT: + // TRANSLATORS: error message + txt.append(_("You're carrying to much to do this!")); + break; + default: + UNIMPLIMENTEDPACKET; + break; + } + + NotifyManager::notify(NotifyTypes::SKILL_FAIL_MESSAGE, txt); +} + +void SkillRecv::processSkillSnap(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readBeingId("being id"); + msg.readInt16("x"); + msg.readInt16("y"); +} + +void SkillRecv::processSkillWarpPoint(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readInt16("skill id"); + msg.readString(16, "map name 1"); + msg.readString(16, "map name 2"); + msg.readString(16, "map name 3"); + msg.readString(16, "map name 4"); +} + +void SkillRecv::processSkillMemoMessage(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readUInt8("type"); +} + +void SkillRecv::processSkillProduceMixList(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + + const int count = (msg.readInt16("len") - 8) / 8; + for (int f = 0; f < count; f ++) + { + msg.readInt16("item id"); + for (int d = 0; d < 3; d ++) + msg.readInt16("material id"); + } +} + +void SkillRecv::processSkillProduceEffect(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + + msg.readInt16("flag"); + msg.readInt16("item id"); +} + +void SkillRecv::processSkillUnitUpdate(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + + msg.readBeingId("being id"); +} + +void SkillRecv::processSkillArrowCreateList(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + + const int count = (msg.readInt16("len") - 4) / 2; + for (int f = 0; f < count; f ++) + msg.readInt16("item id"); +} + +void SkillRecv::processSkillAutoSpells(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + + for (int f = 0; f < 7; f ++) + msg.readInt32("skill id"); + + menu = MenuType::AutoSpell; +} + +void SkillRecv::processSkillDevotionEffect(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + + msg.readBeingId("being id"); + for (int f = 0; f < 5; f ++) + msg.readInt32("devotee id"); + msg.readInt16("range"); +} + +void SkillRecv::processSkillItemListWindow(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + + msg.readInt32("skill level"); + msg.readInt32("unused"); +} + +} // namespace EAthena diff --git a/src/net/eathena/skillrecv.h b/src/net/eathena/skillrecv.h new file mode 100644 index 000000000..532d15cce --- /dev/null +++ b/src/net/eathena/skillrecv.h @@ -0,0 +1,54 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus 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 . + */ + +#ifndef NET_EATHENA_SKILLRECV_H +#define NET_EATHENA_SKILLRECV_H + +#include "net/ea/skillhandler.h" + +#include "net/eathena/messagehandler.h" + +namespace EAthena +{ + namespace SkillRecv + { + void processSkillFailed(Net::MessageIn &msg); + void processPlayerSkills(Net::MessageIn &msg); + void processSkillCoolDown(Net::MessageIn &msg); + void processSkillCoolDownList(Net::MessageIn &msg); + void processSkillSnap(Net::MessageIn &msg); + void processSkillAdd(Net::MessageIn &msg); + void processSkillUpdate(Net::MessageIn &msg); + void processSkillDelete(Net::MessageIn &msg); + void processSkillWarpPoint(Net::MessageIn &msg); + void processSkillMemoMessage(Net::MessageIn &msg); + void processSkillProduceMixList(Net::MessageIn &msg); + void processSkillProduceEffect(Net::MessageIn &msg); + void processSkillUnitUpdate(Net::MessageIn &msg); + void processSkillArrowCreateList(Net::MessageIn &msg); + void processSkillAutoSpells(Net::MessageIn &msg); + void processSkillDevotionEffect(Net::MessageIn &msg); + void processSkillItemListWindow(Net::MessageIn &msg); + } // namespace SkillRecv +} // namespace EAthena + +#endif // NET_EATHENA_SKILLRECV_H diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp index 292e93d2d..33eb884d1 100644 --- a/src/net/tmwa/skillhandler.cpp +++ b/src/net/tmwa/skillhandler.cpp @@ -31,8 +31,11 @@ #include "gui/windows/skilldialog.h" +#include "net/ea/skillrecv.h" + #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" +#include "net/tmwa/skillrecv.h" #include "utils/gettext.h" @@ -64,15 +67,15 @@ void SkillHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_PLAYER_SKILLS: - processPlayerSkills(msg); + SkillRecv::processPlayerSkills(msg); break; case SMSG_PLAYER_SKILL_UP: - processPlayerSkillUp(msg); + Ea::SkillRecv::processPlayerSkillUp(msg); break; case SMSG_SKILL_FAILED: - processSkillFailed(msg); + SkillRecv::processSkillFailed(msg); break; default: @@ -119,175 +122,4 @@ void SkillHandler::useMap(const int id, const std::string &map) const outMsg.writeString(map, 16, "map name"); } -void SkillHandler::processPlayerSkills(Net::MessageIn &msg) -{ - msg.readInt16("len"); - const int skillCount = (msg.getLength() - 4) / 37; - int updateSkill = 0; - - for (int k = 0; k < skillCount; k++) - { - const int skillId = msg.readInt16("skill id"); - const SkillType::SkillType inf = static_cast( - msg.readInt16("inf")); - msg.readInt16("skill pool flags"); - const int level = msg.readInt16("skill level"); - const int sp = msg.readInt16("sp"); - const int range = msg.readInt16("range"); - msg.skip(24, "unused"); - const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); - const int oldLevel = PlayerInfo::getSkillLevel(skillId); - if (oldLevel && oldLevel != level) - updateSkill = skillId; - PlayerInfo::setSkillLevel(skillId, level); - if (skillDialog) - { - if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) - { - skillDialog->addSkill(SkillOwner::Player, - skillId, "", level, range, up, inf, sp); - } - } - } - if (skillDialog) - { - skillDialog->update(); - if (updateSkill) - skillDialog->playUpdateEffect(updateSkill); - } -} - -void SkillHandler::processSkillFailed(Net::MessageIn &msg) -{ - // Action failed (ex. sit because you have not reached the - // right level) - const int skillId = msg.readInt16("skill id"); - const int16_t bskill = msg.readInt16("bskill"); - msg.readInt16("btype"); - const signed char success = msg.readUInt8("success"); - const signed char reason = msg.readUInt8("reason"); - if (success != static_cast(SKILL_FAILED) - && bskill == static_cast(BSKILL_EMOTE)) - { - logger->log("Action: %d/%d", bskill, success); - } - - std::string txt; - if (success == static_cast(SKILL_FAILED) - && skillId == static_cast(SKILL_BASIC)) - { - if (localPlayer && bskill == static_cast(BSKILL_EMOTE) - && reason == static_cast(RFAIL_SKILLDEP)) - { - localPlayer->stopAdvert(); - } - - switch (bskill) - { - case BSKILL_TRADE: - // TRANSLATORS: error message - txt = _("Trade failed!"); - break; - case BSKILL_EMOTE: - // TRANSLATORS: error message - txt = _("Emote failed!"); - break; - case BSKILL_SIT: - // TRANSLATORS: error message - txt = _("Sit failed!"); - break; - case BSKILL_CREATECHAT: - // TRANSLATORS: error message - txt = _("Chat creating failed!"); - break; - case BSKILL_JOINPARTY: - // TRANSLATORS: error message - txt = _("Could not join party!"); - break; - case BSKILL_SHOUT: - // TRANSLATORS: error message - txt = _("Cannot shout!"); - break; - default: - UNIMPLIMENTEDPACKET; - break; - } - - txt.append(" "); - - switch (reason) - { - case RFAIL_SKILLDEP: - // TRANSLATORS: error message - txt.append(_("You have not yet reached a high enough lvl!")); - break; - case RFAIL_INSUFHP: - // TRANSLATORS: error message - txt.append(_("Insufficient HP!")); - break; - case RFAIL_INSUFSP: - // TRANSLATORS: error message - txt.append(_("Insufficient SP!")); - break; - case RFAIL_NOMEMO: - // TRANSLATORS: error message - txt.append(_("You have no memos!")); - break; - case RFAIL_SKILLDELAY: - // TRANSLATORS: error message - txt.append(_("You cannot do that right now!")); - break; - case RFAIL_ZENY: - // TRANSLATORS: error message - txt.append(_("Seems you need more money... ;-)")); - break; - case RFAIL_WEAPON: - // TRANSLATORS: error message - txt.append(_("You cannot use this skill with that " - "kind of weapon!")); - break; - case RFAIL_REDGEM: - // TRANSLATORS: error message - txt.append(_("You need another red gem!")); - break; - case RFAIL_BLUEGEM: - // TRANSLATORS: error message - txt.append(_("You need another blue gem!")); - break; - case RFAIL_OVERWEIGHT: - // TRANSLATORS: error message - txt.append(_("You're carrying to much to do this!")); - break; - default: - // TRANSLATORS: error message - txt.append(_("Huh? What's that?")); - UNIMPLIMENTEDPACKET; - break; - } - } - else - { - switch (skillId) - { - case SKILL_WARP : - // TRANSLATORS: error message - txt = _("Warp failed..."); - break; - case SKILL_STEAL : - // TRANSLATORS: error message - txt = _("Could not steal anything..."); - break; - case SKILL_ENVENOM : - // TRANSLATORS: error message - txt = _("Poison had no effect..."); - break; - default: - UNIMPLIMENTEDPACKET; - break; - } - } - - NotifyManager::notify(NotifyTypes::SKILL_FAIL_MESSAGE, txt); -} - } // namespace TmwAthena diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h index 62bab67d4..f9e965abd 100644 --- a/src/net/tmwa/skillhandler.h +++ b/src/net/tmwa/skillhandler.h @@ -53,11 +53,6 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler const std::string &text) const override final; void useMap(const int id, const std::string &map) const override final; - - protected: - static void processSkillFailed(Net::MessageIn &msg); - - static void processPlayerSkills(Net::MessageIn &msg); }; } // namespace TmwAthena diff --git a/src/net/tmwa/skillrecv.cpp b/src/net/tmwa/skillrecv.cpp new file mode 100644 index 000000000..aa7294de2 --- /dev/null +++ b/src/net/tmwa/skillrecv.cpp @@ -0,0 +1,218 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus 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 . + */ + +#include "net/tmwa/skillrecv.h" + +#include "notifymanager.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" + +#include "enums/resources/notifytypes.h" + +#include "gui/windows/skilldialog.h" + +#include "net/ea/skillrecv.h" + +#include "net/tmwa/messageout.h" +#include "net/tmwa/protocol.h" + +#include "utils/gettext.h" + +#include "debug.h" + +namespace TmwAthena +{ + +void SkillRecv::processPlayerSkills(Net::MessageIn &msg) +{ + msg.readInt16("len"); + const int skillCount = (msg.getLength() - 4) / 37; + int updateSkill = 0; + + for (int k = 0; k < skillCount; k++) + { + const int skillId = msg.readInt16("skill id"); + const SkillType::SkillType inf = static_cast( + msg.readInt16("inf")); + msg.readInt16("skill pool flags"); + const int level = msg.readInt16("skill level"); + const int sp = msg.readInt16("sp"); + const int range = msg.readInt16("range"); + msg.skip(24, "unused"); + const Modifiable up = fromBool(msg.readUInt8("up flag"), Modifiable); + const int oldLevel = PlayerInfo::getSkillLevel(skillId); + if (oldLevel && oldLevel != level) + updateSkill = skillId; + PlayerInfo::setSkillLevel(skillId, level); + if (skillDialog) + { + if (!skillDialog->updateSkill(skillId, range, up, inf, sp)) + { + skillDialog->addSkill(SkillOwner::Player, + skillId, "", level, range, up, inf, sp); + } + } + } + if (skillDialog) + { + skillDialog->update(); + if (updateSkill) + skillDialog->playUpdateEffect(updateSkill); + } +} + +void SkillRecv::processSkillFailed(Net::MessageIn &msg) +{ + // Action failed (ex. sit because you have not reached the + // right level) + const int skillId = msg.readInt16("skill id"); + const int16_t bskill = msg.readInt16("bskill"); + msg.readInt16("btype"); + const signed char success = msg.readUInt8("success"); + const signed char reason = msg.readUInt8("reason"); + if (success != static_cast(SKILL_FAILED) + && bskill == static_cast(BSKILL_EMOTE)) + { + logger->log("Action: %d/%d", bskill, success); + } + + std::string txt; + if (success == static_cast(SKILL_FAILED) + && skillId == static_cast(SKILL_BASIC)) + { + if (localPlayer && + bskill == static_cast(BSKILL_EMOTE) && + reason == static_cast(RFAIL_SKILLDEP)) + { + localPlayer->stopAdvert(); + } + + switch (bskill) + { + case BSKILL_TRADE: + // TRANSLATORS: error message + txt = _("Trade failed!"); + break; + case BSKILL_EMOTE: + // TRANSLATORS: error message + txt = _("Emote failed!"); + break; + case BSKILL_SIT: + // TRANSLATORS: error message + txt = _("Sit failed!"); + break; + case BSKILL_CREATECHAT: + // TRANSLATORS: error message + txt = _("Chat creating failed!"); + break; + case BSKILL_JOINPARTY: + // TRANSLATORS: error message + txt = _("Could not join party!"); + break; + case BSKILL_SHOUT: + // TRANSLATORS: error message + txt = _("Cannot shout!"); + break; + default: + UNIMPLIMENTEDPACKET; + break; + } + + txt.append(" "); + + switch (reason) + { + case RFAIL_SKILLDEP: + // TRANSLATORS: error message + txt.append(_("You have not yet reached a high enough lvl!")); + break; + case RFAIL_INSUFHP: + // TRANSLATORS: error message + txt.append(_("Insufficient HP!")); + break; + case RFAIL_INSUFSP: + // TRANSLATORS: error message + txt.append(_("Insufficient SP!")); + break; + case RFAIL_NOMEMO: + // TRANSLATORS: error message + txt.append(_("You have no memos!")); + break; + case RFAIL_SKILLDELAY: + // TRANSLATORS: error message + txt.append(_("You cannot do that right now!")); + break; + case RFAIL_ZENY: + // TRANSLATORS: error message + txt.append(_("Seems you need more money... ;-)")); + break; + case RFAIL_WEAPON: + // TRANSLATORS: error message + txt.append(_("You cannot use this skill with that " + "kind of weapon!")); + break; + case RFAIL_REDGEM: + // TRANSLATORS: error message + txt.append(_("You need another red gem!")); + break; + case RFAIL_BLUEGEM: + // TRANSLATORS: error message + txt.append(_("You need another blue gem!")); + break; + case RFAIL_OVERWEIGHT: + // TRANSLATORS: error message + txt.append(_("You're carrying to much to do this!")); + break; + default: + // TRANSLATORS: error message + txt.append(_("Huh? What's that?")); + UNIMPLIMENTEDPACKET; + break; + } + } + else + { + switch (skillId) + { + case SKILL_WARP : + // TRANSLATORS: error message + txt = _("Warp failed..."); + break; + case SKILL_STEAL : + // TRANSLATORS: error message + txt = _("Could not steal anything..."); + break; + case SKILL_ENVENOM : + // TRANSLATORS: error message + txt = _("Poison had no effect..."); + break; + default: + UNIMPLIMENTEDPACKET; + break; + } + } + + NotifyManager::notify(NotifyTypes::SKILL_FAIL_MESSAGE, txt); +} + +} // namespace TmwAthena diff --git a/src/net/tmwa/skillrecv.h b/src/net/tmwa/skillrecv.h new file mode 100644 index 000000000..65d4f87c5 --- /dev/null +++ b/src/net/tmwa/skillrecv.h @@ -0,0 +1,39 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus 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 . + */ + +#ifndef NET_TMWA_SKILLRECV_H +#define NET_TMWA_SKILLRECV_H + +#include "net/ea/skillhandler.h" + +#include "net/tmwa/messagehandler.h" + +namespace TmwAthena +{ + namespace SkillRecv + { + void processSkillFailed(Net::MessageIn &msg); + void processPlayerSkills(Net::MessageIn &msg); + } // namespace SkillRecv +} // namespace TmwAthena + +#endif // NET_TMWA_SKILLRECV_H -- cgit v1.2.3-70-g09d2