X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=5676cf93047e8c1d268086d92908d776aa1bc5c8;hb=591ecc2d7ecb0b41144be9b64c09801ac0a28131;hp=59512b61e3e067c5bc3772e6eed7a98a54159758;hpb=628b3a7276d0b330719e05504b23bafcf88f8fca;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 59512b6..5676cf9 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -8,9 +8,19 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include "Stats.h"
+
+#include <vector>
 #include <SDL.h>
 
-namespace graphics { class Sprite; }
+namespace common {
+	class Item;
+	class Spell;
+}
+namespace graphics {
+	class Animation;
+	class Sprite;
+}
 
 namespace battle {
 
@@ -25,23 +35,52 @@ public:
 	Uint8 Level() const { return level; }
 	const graphics::Sprite *Sprite() const { return sprite; }
 
+	const std::vector<const common::Spell *> &Spells() const { return spells; }
+
 	Uint16 MaxHealth() const { return maxHealth; }
 	Uint16 Health() const { return health; }
-	int RelativeHealth(int max) const { return health * max / maxHealth; }
+	int RelativeHealth(int max) const { return Health() * max / MaxHealth(); }
+	void SubtractHealth(int amount);
 
 	Uint16 MaxMana() const { return maxMana; }
 	Uint16 Mana() const { return mana; }
-	int RelativeMana(int max) const { return mana * max / maxMana; }
+	int RelativeMana(int max) const { return MaxMana() == 0 ? 0 : Mana() * max / MaxMana(); }
+	bool CanUseMagic() const { return MaxMana() > 0; }
 
+	Uint8 MaxIP() const { return 255; }
 	Uint8 IP() const { return ip; }
-	int RelativeIP(int max) const { return ip * max / 256; }
-
-	Uint16 Attack() const { return attack; }
-	Uint16 Defense() const { return defense; }
-	Uint16 Agility() const { return agility; }
-	Uint16 Intelligence() const { return intelligence; }
-	Uint16 Gut() const { return gut; }
-	Uint16 MagicResistance() const { return magicResistance; }
+	int RelativeIP(int max) const { return IP() * max / MaxIP(); }
+
+	Stats &GetStats() { return stats; }
+	const Stats &GetStats() const { return stats; }
+
+	common::Item *Weapon() { return weapon; }
+	common::Item *Armor() { return armor; }
+	common::Item *Shield() { return shield; }
+	common::Item *Helmet() { return helmet; }
+	common::Item *Ring() { return ring; }
+	common::Item *Jewel() { return jewel; }
+
+	const common::Item *Weapon() const { return weapon; }
+	const common::Item *Armor() const { return armor; }
+	const common::Item *Shield() const { return shield; }
+	const common::Item *Helmet() const { return helmet; }
+	const common::Item *Ring() const { return ring; }
+	const common::Item *Jewel() const { return jewel; }
+
+	bool HasWeapon() const { return weapon; }
+	bool HasArmor() const { return armor; }
+	bool HasShield() const { return shield; }
+	bool HasHelmet() const { return helmet; }
+	bool HasRing() const { return ring; }
+	bool HasJewel() const { return jewel; }
+
+	graphics::Animation *MeleeAnimation() { return meleeAnimation; }
+	const graphics::Animation *MeleeAnimation() const { return meleeAnimation; }
+	graphics::Animation *AttackAnimation() { return attackAnimation; }
+	const graphics::Animation *AttackAnimation() const { return attackAnimation; }
+	graphics::Animation *SpellAnimation() { return spellAnimation; }
+	const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
 // temporary setters until loader is implemented
 public:
@@ -55,20 +94,43 @@ public:
 	void SetMana(Uint16 m) { mana = m; }
 	void SetIP(Uint8 i) { ip = i; }
 
+	void SetStats(const Stats &s) { stats = s; }
+
+	void SetWeapon(common::Item *i) { weapon = i; }
+	void SetArmor(common::Item *i) { armor = i; }
+	void SetShield(common::Item *i) { shield = i; }
+	void SetHelmet(common::Item *i) { helmet = i; }
+	void SetRing(common::Item *i) { ring = i; }
+	void SetJewel(common::Item *i) { jewel = i; }
+
+	void AddSpell(const common::Spell *s) { spells.push_back(s); }
+
+	void SetMeleeAnimation(graphics::Animation *a) { meleeAnimation = a; }
+	void SetAttackAnimation(graphics::Animation *a) { attackAnimation = a; }
+	void SetSpellAnimation(graphics::Animation *a) { spellAnimation = a; }
+
 private:
 	const char *name;
 	graphics::Sprite *sprite;
-	// TODO: equipment and spells lists
+
+	common::Item *weapon;
+	common::Item *armor;
+	common::Item *shield;
+	common::Item *helmet;
+	common::Item *ring;
+	common::Item *jewel;
+
+	graphics::Animation *meleeAnimation;
+	graphics::Animation *attackAnimation;
+	graphics::Animation *spellAnimation;
+
+	// TODO: vector does not seem to be a good choice
+	std::vector<const common::Spell *> spells;
 
 	Uint16 maxHealth, health;
 	Uint16 maxMana, mana;
 
-	Uint16 attack;
-	Uint16 defense;
-	Uint16 agility;
-	Uint16 intelligence;
-	Uint16 gut;
-	Uint16 magicResistance;
+	Stats stats;
 
 	Uint8 level;
 	Uint8 ip;