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

diff --git a/src/common/Capsule.cpp b/src/common/Capsule.cpp
index a944e70..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"
@@ -23,6 +24,8 @@ Capsule::Capsule()
 : name("")
 , alignment("")
 
+, alignmentSprite(0)
+
 , maxHealth(0)
 
 , level(1)
@@ -33,18 +36,39 @@ Capsule::Capsule()
 
 , classes(0)
 , numClasses(0)
-, curClass(0)
+, curClass(-1)
 , maxClass(0) {
 
 }
 
 
+const char *Capsule::ClassName() const {
+	return GetClass().name;
+}
+
+const char *Capsule::Tribe() const {
+	return GetClass().tribe;
+}
+
+const Spell *Capsule::Attack1() const {
+	return GetClass().attacks[0];
+}
+
+const Spell *Capsule::Attack2() const {
+	return GetClass().attacks[1];
+}
+
+const Spell *Capsule::Attack3() const {
+	return GetClass().attacks[2];
+}
+
+
 Uint16 Capsule::MaxHealth() const {
 	return maxHealth + GetClass().healthBoost;
 }
 
 
-Stats Capsule::GetStats() {
+Stats Capsule::GetStats() const {
 	return stats + GetClass().statBoost;
 }
 
@@ -57,6 +81,44 @@ int Capsule::NextLevel() const {
 	}
 }
 
+void Capsule::UpgradeClass() {
+	++maxClass;
+	++curClass;
+}
+
+void Capsule::NextClass() {
+	if (maxClass == numClasses) {
+		return;
+	}
+	++curClass;
+	if (curClass >= maxClass) {
+		curClass = 0;
+	}
+}
+
+void Capsule::PreviousClass() {
+	if (maxClass == numClasses) {
+		return;
+	}
+	--curClass;
+	if (curClass < 0) {
+		curClass = maxClass - 1;
+	}
+}
+
+void Capsule::SetClass(int index) {
+	if (maxClass == numClasses) {
+		return;
+	}
+	curClass = index;
+	if (curClass < 0 ) {
+		curClass = 0;
+	}
+	if (curClass >= maxClass) {
+		curClass = maxClass - 1;
+	}
+}
+
 
 Sprite *Capsule::BattleSprite() {
 	return GetClass().battleSprite;
@@ -90,6 +152,44 @@ const Capsule::Class &Capsule::GetClass() const {
 }
 
 
+int Capsule::HungerEmpty() const {
+	return HungerTotal() - HungerFull();
+}
+
+int Capsule::HungerTotal() const {
+	return GetClass().hunger;
+}
+
+int Capsule::HungerFull() const {
+	return GetClass().hungerFull;
+}
+
+bool Capsule::IsHungry() const {
+	return HungerEmpty();
+}
+
+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
+	int value = 1;
+	GetClass().hungerFull += value;
+	if (GetClass().hungerFull >= GetClass().hunger) {
+		GetClass().hungerFull = GetClass().hunger;
+		UpgradeClass();
+	}
+}
+
+const common::Item *Capsule::UpgradeItem() const {
+	return GetClass().upgradeItem;
+}
+
+void Capsule::UpgradeSpecial() {
+	maxClass = GetClass().upgradeClass + 1;
+	curClass = GetClass().upgradeClass;
+}
+
+
 Capsule::Class::Class()
 : name(0)
 , tribe(0)
@@ -98,6 +198,12 @@ Capsule::Class::Class()
 , attackAnimation(0)
 , spellAnimation(0)
 
+
+, upgradeItem(0)
+, upgradeClass(0)
+, hunger(32)
+, hungerFull(0)
+
 , healthBoost(0) {
 	attacks[0] = 0;
 	attacks[1] = 0;
@@ -115,6 +221,9 @@ void Capsule::CreateTypeDescription() {
 	td.AddField("name", FieldDescription(((char *)&c.name) - ((char *)&c), Interpreter::STRING_ID).SetReferenced());
 	td.AddField("alignment", FieldDescription(((char *)&c.alignment) - ((char *)&c), Interpreter::STRING_ID).SetReferenced());
 
+	td.AddField("alignmentCursor", FieldDescription(((char *)&c.alignmentCursor) - ((char *)&c), Interpreter::VECTOR_ID));
+	td.AddField("alignmentSprite", FieldDescription(((char *)&c.alignmentSprite) - ((char *)&c), Sprite::TYPE_ID).SetReferenced());
+
 	td.AddField("maxHealth", FieldDescription(((char *)&c.maxHealth) - ((char *)&c), Interpreter::NUMBER_ID));
 
 	td.AddField("stats", FieldDescription(((char *)&c.stats) - ((char *)&c), Stats::TYPE_ID));
@@ -122,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));
 
@@ -155,6 +264,10 @@ 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));
 	td.AddField("statBoost", FieldDescription(((char *)&c.statBoost) - ((char *)&c), Stats::TYPE_ID));
 }