moved upgrade process to battle class

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

diff --git a/src/common/Capsule.cpp b/src/common/Capsule.cpp
index 487958596fe767b94a75ad20d6e403a04a3f9b4c..de2ea56583fd7ff77a0d5375782d0f1f93f907e1 100644 (file)
--- a/src/common/Capsule.cpp
+++ b/src/common/Capsule.cpp
@@ -1,7 +1,9 @@
 #include "Capsule.h"
 
-#include "../common/Spell.h"
-#include "../common/Stats.h"
+#include "Item.h"
+#include "Spell.h"
+#include "Stats.h"
+#include "Upgrade.h"
 #include "../graphics/Animation.h"
 #include "../graphics/Sprite.h"
 #include "../loader/Interpreter.h"
@@ -16,6 +18,7 @@ using graphics::Sprite;
 using loader::FieldDescription;
 using loader::Interpreter;
 using loader::TypeDescription;
+using std::vector;
 
 namespace common {
 
@@ -80,12 +83,45 @@ int Capsule::NextLevel() const {
        }
 }
 
+void Capsule::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()));
+}
+
+
 void Capsule::UpgradeClass() {
        ++maxClass;
        ++curClass;
 }
 
 void Capsule::NextClass() {
+       if (maxClass == numClasses) {
+               return;
+       }
        ++curClass;
        if (curClass >= maxClass) {
                curClass = 0;
@@ -93,6 +129,9 @@ void Capsule::NextClass() {
 }
 
 void Capsule::PreviousClass() {
+       if (maxClass == numClasses) {
+               return;
+       }
        --curClass;
        if (curClass < 0) {
                curClass = maxClass - 1;
@@ -100,6 +139,9 @@ void Capsule::PreviousClass() {
 }
 
 void Capsule::SetClass(int index) {
+       if (maxClass == numClasses) {
+               return;
+       }
        curClass = index;
        if (curClass < 0 ) {
                curClass = 0;
@@ -158,7 +200,7 @@ bool Capsule::IsHungry() const {
        return HungerEmpty();
 }
 
-void Capsule::Feed(const common::Item *) {
+void Capsule::Feed(const common::Item *item) {
        // TODO: find out how to calculate an item's feed value
        // TODO: an item the capsule favors (changes on every feed and after every
        //       battle) doubles the value
@@ -170,6 +212,15 @@ void Capsule::Feed(const common::Item *) {
        }
 }
 
+const common::Item *Capsule::UpgradeItem() const {
+       return GetClass().upgradeItem;
+}
+
+void Capsule::UpgradeSpecial() {
+       maxClass = GetClass().upgradeClass + 1;
+       curClass = GetClass().upgradeClass;
+}
+
 
 Capsule::Class::Class()
 : name(0)
@@ -179,6 +230,9 @@ Capsule::Class::Class()
 , attackAnimation(0)
 , spellAnimation(0)
 
+
+, upgradeItem(0)
+, upgradeClass(0)
 , hunger(32)
 , hungerFull(0)
 
@@ -209,9 +263,9 @@ void Capsule::CreateTypeDescription() {
        td.AddField("level", FieldDescription(((char *)&c.level) - ((char *)&c), Interpreter::NUMBER_ID));
        td.AddField("experience", FieldDescription(((char *)&c.experience) - ((char *)&c), Interpreter::NUMBER_ID));
 
-       td.AddField("ladder", FieldDescription(((char *)&c.levelLadder) - ((char *)&c), Interpreter::NUMBER_ID).SetReferenced().SetAggregate());
+       td.AddField("ladder", FieldDescription(((char *)&c.levelLadder) - ((char *)&c), Interpreter::NUMBER_ID).SetAggregate());
 
-       td.AddField("classes", FieldDescription(((char *)&c.classes) - ((char *)&c), Class::TYPE_ID).SetReferenced().SetAggregate());
+       td.AddField("classes", FieldDescription(((char *)&c.classes) - ((char *)&c), Class::TYPE_ID).SetAggregate());
        td.AddField("class", FieldDescription(((char *)&c.curClass) - ((char *)&c), Interpreter::NUMBER_ID));
        td.AddField("maxClass", FieldDescription(((char *)&c.maxClass) - ((char *)&c), Interpreter::NUMBER_ID));
 
@@ -242,6 +296,8 @@ void Capsule::Class::CreateTypeDescription() {
        td.AddField("attackAnimation", FieldDescription(((char *)&c.attackAnimation) - ((char *)&c), Animation::TYPE_ID).SetReferenced());
        td.AddField("spellAnimation", FieldDescription(((char *)&c.spellAnimation) - ((char *)&c), Animation::TYPE_ID).SetReferenced());
 
+       td.AddField("upgradeItem", FieldDescription(((char *)&c.upgradeItem) - ((char *)&c), common::Item::TYPE_ID).SetReferenced());
+       td.AddField("upgradeClass", FieldDescription(((char *)&c.upgradeClass) - ((char *)&c), Interpreter::NUMBER_ID));
        td.AddField("hunger", FieldDescription(((char *)&c.hunger) - ((char *)&c), Interpreter::NUMBER_ID));
 
        td.AddField("healthBoost", FieldDescription(((char *)&c.healthBoost) - ((char *)&c), Interpreter::NUMBER_ID));