Added weapon skill system and leveling system.

7 files changed, 162 insertions, 132 deletions

diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index bbfa82a4..c83b68f1 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -215,7 +215,9 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setGender(msg.readInt8());
     int hs = msg.readInt8(), hc = msg.readInt8();
     tempPlayer->setHairStyle(hs, hc);
-    tempPlayer->setLevel(msg.readInt8());
+    tempPlayer->setLevel(msg.readInt16());
+    tempPlayer->setCharacterPoints(msg.readInt16());
+    tempPlayer->setCorrectionPoints(msg.readInt16());
     tempPlayer->setMoney(msg.readInt32());
 
     for (int i = 0; i < 7; i++)
diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index bb3567d3..67edc7ad 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.cpp
@@ -154,3 +154,17 @@ void Net::GameServer::Player::tradeWithNPC(int item, int amount)
     msg.writeInt16(amount);
     Net::GameServer::connection->send(msg);
 }
+
+void Net::GameServer::Player::raiseAttribute(int attribute)
+{
+    MessageOut msg(PGMSG_RAISE_ATTRIBUTE);
+    msg.writeInt8(attribute);
+    Net::GameServer::connection->send(msg);
+}
+
+void Net::GameServer::Player::lowerAttribute(int attribute)
+{
+    MessageOut msg(PGMSG_LOWER_ATTRIBUTE);
+    msg.writeInt8(attribute);
+    Net::GameServer::connection->send(msg);
+}
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index b5f3e6d7..7ebb2830 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.h
@@ -51,6 +51,8 @@ namespace Net
             void tradeItem(int slot, int amount);
             void tradeMoney(int amount);
             void tradeWithNPC(int item, int amount);
+            void raiseAttribute(int attribute);
+            void lowerAttribute(int attribute);
         }
     }
 }
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index f6f7a8fa..951d6d4e 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -29,6 +29,7 @@
 #include "../engine.h"
 #include "../localplayer.h"
 #include "../log.h"
+#include "../particle.h"
 #include "../npc.h"
 
 #include "../gui/buy.h"
@@ -90,6 +91,11 @@ PlayerHandler::PlayerHandler()
         GPMSG_PLAYER_MAP_CHANGE,
         GPMSG_PLAYER_SERVER_CHANGE,
         GPMSG_PLAYER_ATTRIBUTE_CHANGE,
+        GPMSG_PLAYER_EXP_CHANGE,
+        GPMSG_LEVELUP,
+        GPMSG_LEVEL_PROGRESS,
+        GPMSG_RAISE_ATTRIBUTE_RESPONSE,
+        GPMSG_LOWER_ATTRIBUTE_RESPONSE,
         0
     };
     handledMessages = _messages;
@@ -128,6 +134,14 @@ void PlayerHandler::handleMessage(MessageIn &msg)
                 }
                 else if (stat < NB_CHARACTER_ATTRIBUTES)
                 {
+                    if (stat >= CHAR_SKILL_BEGIN && stat < CHAR_SKILL_END
+                        && player_node->getAttributeBase(stat) < base
+                        && player_node->getAttributeBase(stat) > -1)
+                    {
+                        Particle* effect = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0);
+                        player_node->controlParticle(effect);
+                    }
+
                     player_node->setAttributeBase(stat, base);
                     player_node->setAttributeEffective(stat, value);
                 }
@@ -138,6 +152,120 @@ void PlayerHandler::handleMessage(MessageIn &msg)
                 }
             }
         } break;
+
+        case GPMSG_PLAYER_EXP_CHANGE:
+        {
+            logger->log("EXP Update");
+            while (msg.getUnreadLength())
+            {
+                int skill = msg.readInt8();
+                int current = msg.readInt32();
+                int next = msg.readInt32();
+
+                if (skill < CHAR_SKILL_NB)
+                {
+                    player_node->setExperience(skill, current, next);
+                }
+                else
+                {
+                    logger->log("Warning: server wants to update experience of unknown "
+                                "skill  %d to %d / %d", skill, current, next);
+                }
+            }
+        } break;
+
+        case GPMSG_LEVELUP:
+        {
+            player_node->setLevel(msg.readInt16());
+            player_node->setCharacterPoints(msg.readInt16());
+            player_node->setCorrectionPoints(msg.readInt16());
+            Particle* effect = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0);
+            player_node->controlParticle(effect);
+        } break;
+
+
+        case GPMSG_LEVEL_PROGRESS:
+        {
+            logger->log("Level Progress Update");
+            player_node->setLevelProgress(msg.readInt8());
+        } break;
+
+
+        case GPMSG_RAISE_ATTRIBUTE_RESPONSE:
+        {
+            int errCode = msg.readInt8();
+            int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN;
+            switch (errCode)
+            {
+                case ATTRIBMOD_OK:
+                {
+                    // feel(acknowledgment);
+                } break;
+                case ATTRIBMOD_INVALID_ATTRIBUTE:
+                {
+                    logger->log("Warning: Server denied increase of attribute %d (unknown attribute) ", attrNum);
+                } break;
+                case ATTRIBMOD_NO_POINTS_LEFT:
+                {
+                    // when the server says "you got no points" it
+                    // has to be correct. The server is always right!
+                    // undo attribute change and set points to 0
+                    logger->log("Warning: Server denied increase of attribute %d (no points left) ", attrNum);
+                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
+                    player_node->setCharacterPoints(0);
+                    player_node->setAttributeBase(attrNum, attrValue);
+                } break;
+                case ATTRIBMOD_DENIED:
+                {
+                    // undo attribute change
+                    logger->log("Warning: Server denied increase of attribute %d (reason unknown) ", attrNum);
+                    int points = player_node->getCharacterPoints() - 1;
+                    player_node->setCharacterPoints(points);
+                    int attrValue = player_node->getAttributeBase(attrNum) - 1;
+                    player_node->setAttributeBase(attrNum, attrValue);
+                } break;
+            }
+        } break;
+
+        case GPMSG_LOWER_ATTRIBUTE_RESPONSE:
+        {
+            int errCode = msg.readInt8();
+            int attrNum = msg.readInt8() - CHAR_ATTR_BEGIN;
+            switch (errCode)
+            {
+                case ATTRIBMOD_OK:
+                {
+                    // feel(acknowledgment);
+                } break;
+                case ATTRIBMOD_INVALID_ATTRIBUTE:
+                {
+                    logger->log("Warning: Server denied reduction of attribute %d (unknown attribute) ", attrNum);
+                } break;
+                case ATTRIBMOD_NO_POINTS_LEFT:
+                {
+                    // when the server says "you got no points" it
+                    // has to be correct. The server is always right!
+                    // undo attribute change and set points to 0
+                    logger->log("Warning: Server denied reduction of attribute %d (no points left) ", attrNum);
+                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
+                    player_node->setCorrectionPoints(0);
+                    player_node->setAttributeBase(attrNum, attrValue);
+                    break;
+                } break;
+                case ATTRIBMOD_DENIED:
+                {
+                    // undo attribute change
+                    logger->log("Warning: Server denied reduction of attribute %d (reason unknown) ", attrNum);
+                    int charaPoints = player_node->getCharacterPoints() - 1;
+                    player_node->setCharacterPoints(charaPoints);
+                    int correctPoints = player_node->getCharacterPoints() + 1;
+                    player_node->setCorrectionPoints(correctPoints);
+                    int attrValue = player_node->getAttributeBase(attrNum) + 1;
+                    player_node->setAttributeBase(attrNum, attrValue);
+                } break;
+            }
+
+        } break;
         /*
         case SMSG_PLAYER_ARROW_MESSAGE:
             {
diff --git a/src/net/protocol.h b/src/net/protocol.h
index d8b9fcb2..e6f5869b 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -49,7 +49,7 @@ enum {
     APMSG_CHAR_CREATE_RESPONSE     = 0x0021, // B error
     PAMSG_CHAR_DELETE              = 0x0022, // B index
     APMSG_CHAR_DELETE_RESPONSE     = 0x0023, // B error
-    APMSG_CHAR_INFO                = 0x0024, // B index, S name, B gender, B hair style, B hair color, B level, W money, W*6 stats
+    APMSG_CHAR_INFO                = 0x0024, // B index, S name, B gender, B hair style, B hair color, W level, W character points, W correction points, D money, W*6 stats
     PAMSG_CHAR_SELECT              = 0x0026, // B index
     APMSG_CHAR_SELECT_RESPONSE     = 0x0027, // B error, B*32 token, S game address, W game port, S chat address, W chat port
     PAMSG_EMAIL_CHANGE             = 0x0030, // S email
@@ -83,6 +83,13 @@ enum {
     GPMSG_INVENTORY                = 0x0120, // { B slot, W item id [, B amount] }*
     GPMSG_INVENTORY_FULL           = 0x0121, // { B slot, W item id [, B amount] }*
     GPMSG_PLAYER_ATTRIBUTE_CHANGE  = 0x0130, // { B attribute, W base value, W modified value }*
+    GPMSG_PLAYER_EXP_CHANGE        = 0x0140, // { B skill, D exp got, D exp needed }*
+    GPMSG_LEVELUP                  = 0x0150, // W new level
+    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
+    PGMSG_LOWER_ATTRIBUTE          = 0x0170, // B attribute
+    GPMSG_LOWER_ATTRIBUTE_RESPONSE = 0x0171, // B error, B attribute
     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 }*
                                              // monster: W type id
@@ -183,6 +190,13 @@ enum {
     CREATE_TOO_MUCH_CHARACTERS
 };
 
+// Character attribute modification specific return value
+enum AttribmodResponseCode {
+    ATTRIBMOD_OK = ERRMSG_OK,
+    ATTRIBMOD_INVALID_ATTRIBUTE = 0x40,
+    ATTRIBMOD_NO_POINTS_LEFT,
+    ATTRIBMOD_DENIED
+};
 // Object type enumeration
 enum {
     // A simple item
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
deleted file mode 100644
index 8a19fe45..00000000
--- a/src/net/skillhandler.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World 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.
- *
- *  The Mana World 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 The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "skillhandler.h"
-
-#include "messagein.h"
-#include "protocol.h"
-
-#include "../log.h"
-
-#include "../gui/chat.h"
-#include "../gui/skill.h"
-
-SkillHandler::SkillHandler()
-{
-    static const Uint16 _messages[] = {
-        0
-    };
-    handledMessages = _messages;
-}
-
-void SkillHandler::handleMessage(MessageIn &msg)
-{
-    switch (msg.getId())
-    {
-#if 0
-        case SMSG_PLAYER_SKILLS:
-            msg.readInt16();  // length
-            skillCount = (msg.getLength() - 4) / 37;
-            skillDialog->cleanList();
-
-            for (int k = 0; k < skillCount; k++)
-            {
-                Sint16 skillId = msg.readInt16();
-                msg.readInt16();  // target type
-                msg.readInt16();  // unknown
-                Sint16 level = msg.readInt16();
-                Sint16 sp = msg.readInt16();
-                msg.readInt16();  // range
-                std::string skillName = msg.readString(24);
-                Sint8 up = msg.readInt8();
-
-                if (level != 0 || up != 0)
-                {
-                    if (skillDialog->hasSkill(skillId)) {
-                        skillDialog->setSkill(skillId, level, sp);
-                    }
-                    else {
-                        skillDialog->addSkill(skillId, level, sp);
-                    }
-                }
-            }
-            break;
-
-        case SMSG_SKILL_FAILED:
-            // Action failed (ex. sit because you have not reached the
-            // right level)
-            CHATSKILL action;
-            action.skill   = msg.readInt16();
-            action.bskill  = msg.readInt16();
-            action.unused  = msg.readInt16(); // unknown
-            action.success = msg.readInt8();
-            action.reason  = msg.readInt8();
-            if (action.success != SKILL_FAILED &&
-                action.bskill == BSKILL_EMOTE)
-            {
-                logger->log("Action: %d/%d", action.bskill, action.success);
-            }
-            chatWindow->chatLog(action);
-            break;
-#endif
-    }
-}
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
deleted file mode 100644
index 8c0653d4..00000000
--- a/src/net/skillhandler.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World 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.
- *
- *  The Mana World 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 The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_NET_SKILLHANDLER_H
-#define _TMW_NET_SKILLHANDLER_H
-
-#include "messagehandler.h"
-
-class SkillHandler : public MessageHandler
-{
-    public:
-        SkillHandler();
-
-        void handleMessage(MessageIn &msg);
-};
-
-#endif