X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FCapsule.cpp;h=6667068c3c8299dc11268faa889d4cba9a383a8e;hb=dc275497c592669dda75645604a9b35d32f63e90;hp=487958596fe767b94a75ad20d6e403a04a3f9b4c;hpb=e518ac67cf94e244df16078dcbc536e6b659e758;p=l2e.git

diff --git a/src/common/Capsule.cpp b/src/common/Capsule.cpp
index 4879585..6667068 100644
--- a/src/common/Capsule.cpp
+++ b/src/common/Capsule.cpp
@@ -1,5 +1,6 @@
 #include "Capsule.h"
 
+#include "../common/Item.h"
 #include "../common/Spell.h"
 #include "../common/Stats.h"
 #include "../graphics/Animation.h"
@@ -86,6 +87,9 @@ void Capsule::UpgradeClass() {
 }
 
 void Capsule::NextClass() {
+	if (maxClass == numClasses) {
+		return;
+	}
 	++curClass;
 	if (curClass >= maxClass) {
 		curClass = 0;
@@ -93,6 +97,9 @@ void Capsule::NextClass() {
 }
 
 void Capsule::PreviousClass() {
+	if (maxClass == numClasses) {
+		return;
+	}
 	--curClass;
 	if (curClass < 0) {
 		curClass = maxClass - 1;
@@ -100,6 +107,9 @@ void Capsule::PreviousClass() {
 }
 
 void Capsule::SetClass(int index) {
+	if (maxClass == numClasses) {
+		return;
+	}
 	curClass = index;
 	if (curClass < 0 ) {
 		curClass = 0;
@@ -158,7 +168,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 +180,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 +198,9 @@ Capsule::Class::Class()
 , attackAnimation(0)
 , spellAnimation(0)
 
+
+, upgradeItem(0)
+, upgradeClass(0)
 , hunger(32)
 , hungerFull(0)
 
@@ -209,9 +231,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 +264,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));