X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FCapsule.cpp;h=3bfdde7456caa574451a6cf7bd26d5e00ff2ff61;hb=b9e715649b41cb69ea1b2d2a588522541eb87b46;hp=de2ea56583fd7ff77a0d5375782d0f1f93f907e1;hpb=3d69f521b593457304b282e5f23e36ab165288b6;p=l2e.git

diff --git a/src/common/Capsule.cpp b/src/common/Capsule.cpp
index de2ea56..3bfdde7 100644
--- a/src/common/Capsule.cpp
+++ b/src/common/Capsule.cpp
@@ -1,8 +1,8 @@
 #include "Capsule.h"
 
 #include "Item.h"
+#include "LevelUp.h"
 #include "Spell.h"
-#include "Stats.h"
 #include "Upgrade.h"
 #include "../graphics/Animation.h"
 #include "../graphics/Sprite.h"
@@ -77,7 +77,7 @@ Stats Capsule::GetStats() const {
 int Capsule::NextLevel() const {
 	int levelOffset(Level() - 1);
 	if (levelOffset < numLevels) {
-		return levelLadder[levelOffset] - Experience();
+		return levelLadder[levelOffset].Experience() - Experience();
 	} else {
 		return 0;
 	}
@@ -92,14 +92,40 @@ void Capsule::AddExperience(int exp, vector<Upgrade> &info) {
 	}
 	int remain = exp;
 	while (remain >= NextLevel()) {
+		const LevelUp &lup = levelLadder[level - 1];
 		int added = NextLevel();
 		experience += added;
 		remain -= added;
 		++level;
+		maxHealth += lup.MaxHealth();
+		stats += lup;
 
 		info.push_back(Upgrade(name, Upgrade::LEVEL_UP, level));
 
-		// TODO: upgrade attributes and push info
+		if (lup.MaxHealth() > 0) {
+			info.push_back(Upgrade(name, Upgrade::MAX_HEALTH, lup.MaxHealth()));
+		}
+		if (lup.Attack() > 0) {
+			info.push_back(Upgrade(name, Upgrade::ATTACK, lup.Attack()));
+		}
+		if (lup.Defense() > 0) {
+			info.push_back(Upgrade(name, Upgrade::DEFENSE, lup.Defense()));
+		}
+		if (lup.Strength() > 0) {
+			info.push_back(Upgrade(name, Upgrade::STRENGTH, lup.Strength()));
+		}
+		if (lup.Agility() > 0) {
+			info.push_back(Upgrade(name, Upgrade::AGILITY, lup.Agility()));
+		}
+		if (lup.Intelligence() > 0) {
+			info.push_back(Upgrade(name, Upgrade::INTELLIGENCE, lup.Intelligence()));
+		}
+		if (lup.Gut() > 0) {
+			info.push_back(Upgrade(name, Upgrade::GUT, lup.Gut()));
+		}
+		if (lup.MagicResistance() > 0) {
+			info.push_back(Upgrade(name, Upgrade::MAGIC_RESISTANCE, lup.MagicResistance()));
+		}
 
 		if (level > numLevels) {
 			info.push_back(Upgrade(
@@ -263,7 +289,7 @@ 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).SetAggregate());
+	td.AddField("ladder", FieldDescription(((char *)&c.levelLadder) - ((char *)&c), LevelUp::TYPE_ID).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));