X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FCapsule.cpp;h=de2ea56583fd7ff77a0d5375782d0f1f93f907e1;hb=3d69f521b593457304b282e5f23e36ab165288b6;hp=a944e70c622bffbed9fbeecd6759ff298bf23dec;hpb=11cf419b542070def1d0edaa69d2389ab1ab427b;p=l2e.git diff --git a/src/common/Capsule.cpp b/src/common/Capsule.cpp index a944e70..de2ea56 100644 --- 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 { @@ -23,6 +26,8 @@ Capsule::Capsule() : name("") , alignment("") +, alignmentSprite(0) + , maxHealth(0) , level(1) @@ -33,18 +38,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 +83,74 @@ int Capsule::NextLevel() const { } } +void Capsule::AddExperience(int exp, vector &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; + } +} + +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 +184,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 +230,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 +253,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 +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)); @@ -155,6 +296,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)); }