moved upgrade process to battle class

[l2e.git] / src / common / Hero.cpp

diff --git a/src/common/Hero.cpp b/src/common/Hero.cpp
index 7150af0a35b8c0528058d5c845794875c4483c18..beeab8305844b8a9b2cccb95a98a66d73c8153ee 100644 (file)
--- a/src/common/Hero.cpp
+++ b/src/common/Hero.cpp
@@ -1,14 +1,8 @@
-/*
- * Hero.cpp
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #include "Hero.h"
 
 #include "Item.h"
 #include "Spell.h"
+#include "Upgrade.h"
 #include "../graphics/Animation.h"
 #include "../graphics/Sprite.h"
 #include "../loader/Interpreter.h"
@@ -24,6 +18,7 @@ using loader::Interpreter;
 using loader::TypeDescription;
 using map::Entity;
 using std::memset;
+using std::vector;
 
 
 namespace common {
@@ -76,6 +71,35 @@ int Hero::NextLevel() const {
        }
 }
 
+void Hero::AddExperience(int exp, vector<Upgrade> &info) {
+       if (level > numLevels) {
+               // don't award any experience if at highest level
+               info.push_back(Upgrade(
+                               name, Upgrade::LEVEL_NEXT, NextLevel()));
+               return;
+       }
+       int remain = exp;
+       while (remain >= NextLevel()) {
+               int added = NextLevel();
+               experience += added;
+               remain -= added;
+               ++level;
+
+               info.push_back(Upgrade(name, Upgrade::LEVEL_UP, level));
+
+               // TODO: upgrade attributes and push info
+
+               if (level > numLevels) {
+                       info.push_back(Upgrade(
+                                       name, Upgrade::LEVEL_NEXT, NextLevel()));
+                       return;
+               }
+       }
+       experience += remain;
+       info.push_back(Upgrade(
+                       name, Upgrade::LEVEL_NEXT, NextLevel()));
+}
+
 
 bool Hero::CanEquip(const Item &item) const {
        return useMask & item.HeroMask();
@@ -104,7 +128,7 @@ void Hero::CreateTypeDescription() {
        td.AddField("stats", FieldDescription(((char *)&h.stats) - ((char *)&h), Stats::TYPE_ID));
 
        td.AddField("level", FieldDescription(((char *)&h.level) - ((char *)&h), Interpreter::NUMBER_ID));
-       td.AddField("ladder", FieldDescription(((char *)&h.levelLadder) - ((char *)&h), Interpreter::NUMBER_ID).SetReferenced().SetAggregate());
+       td.AddField("ladder", FieldDescription(((char *)&h.levelLadder) - ((char *)&h), Interpreter::NUMBER_ID).SetAggregate());
 
        td.AddField("useMask", FieldDescription(((char *)&h.useMask) - ((char *)&h), Interpreter::NUMBER_ID));